fix for map and location obj