Loaction fix