fix for locations