Location support, fixed round 2