Better location handling (snowman remix)