Fix a conflict with location_update