Better location handling (snowflake remix)