Fixing 'Location'