diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs
index 117aaefa..ae8c56c2 100644
--- a/MapControl/Shared/MapPanel.cs
+++ b/MapControl/Shared/MapPanel.cs
@@ -197,7 +197,7 @@ namespace MapControl
                 var coercedPosition = parentMap.LocationToView(
                     new Location(location.Latitude, parentMap.CoerceLongitude(location.Longitude)));
 
-                if (coercedPosition.HasValue && parentMap.InsideViewport(coercedPosition.Value))
+                if (coercedPosition.HasValue)
                 {
                     position = coercedPosition;
                 }
@@ -234,7 +234,7 @@ namespace MapControl
                     var coercedPosition = parentMap.LocationToView(
                         new Location(location.Latitude, parentMap.CoerceLongitude(location.Longitude)));
 
-                    if (coercedPosition.HasValue && parentMap.InsideViewport(coercedPosition.Value))
+                    if (coercedPosition.HasValue)
                     {
                         position = coercedPosition.Value;
                     }
diff --git a/MapControl/Shared/MapPath.cs b/MapControl/Shared/MapPath.cs
index 5a65c643..309df5f8 100644
--- a/MapControl/Shared/MapPath.cs
+++ b/MapControl/Shared/MapPath.cs
@@ -86,13 +86,7 @@ namespace MapControl
 
                 if (position.HasValue && !parentMap.InsideViewport(position.Value))
                 {
-                    var coercedLongitude = parentMap.CoerceLongitude(location.Longitude);
-                    var coercedPosition = parentMap.LocationToView(new Location(location.Latitude, coercedLongitude));
-
-                    if (coercedPosition.HasValue && parentMap.InsideViewport(coercedPosition.Value))
-                    {
-                        longitudeOffset = coercedLongitude - location.Longitude;
-                    }
+                    longitudeOffset = parentMap.CoerceLongitude(location.Longitude) - location.Longitude;
                 }
             }