fixing some Location Bolt issue