fix locations