Better location handling (espresso sugar remix)