Fixed an error where the nearest shape would be selected, regardless of the distance
Reverted my changes in Move to use the correct coordinates
Merge remote-tracking branch 'origin/master'