Fix for locations in attribute