Remove if statement to fix locations problem