Fix for location bug.