Better location handling (recursive remix by DJ David)