0.1.27.3 - Location improvement