another fix for locations