Merge "Fixing syntax and behavior from previous commit"