Fixed variable names
Fixed merge issue