Fixed loading / saving problem with Location