Better location handling (icecream remix)