fix ways to existing locations