Fixed security vuln relating to location, thanks to mward