Removed a bug with the locations.