Fix locations bug