Bug Fix
Fix the jumps causing by selecting other locations.