Hopefully fix the location situation