Fix for location