Adds back stupid location-id