Better location handling (yellow kiwi remix)