diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs
index f2fe7e73..f933c00b 100644
--- a/MapControl/Shared/MapPanel.cs
+++ b/MapControl/Shared/MapPanel.cs
@@ -207,8 +207,8 @@ namespace MapControl
                 position.HasValue &&
                 IsOutsideViewport(position.Value))
             {
-                location = new Location(location.Latitude, parentMap.ConstrainedLongitude(location.Longitude));
-                position = parentMap.LocationToView(location);
+                position = parentMap.LocationToView(
+                    new Location(location.Latitude, parentMap.ConstrainedLongitude(location.Longitude)));
             }
 
             return position;