Fixing my locations