Fix location_bugs