Fix for location service