Fix issue: Location not taken into account when manually selected