Fix for locations