Loader + Locations Fix