Fixed conflicts of variable name with previous commit