diff --git a/MapControl/Shared/MapImageLayer.cs b/MapControl/Shared/MapImageLayer.cs
index ac15faa3..c268a979 100644
--- a/MapControl/Shared/MapImageLayer.cs
+++ b/MapControl/Shared/MapImageLayer.cs
@@ -170,7 +170,7 @@ namespace MapControl
             }
         }
 
-        protected abstract Task<ImageSource> GetImageAsync(Rect mapBoundingBox, IProgress<double> progress);
+        protected abstract Task<ImageSource> GetImageAsync(Rect mapRect, IProgress<double> progress);
 
         protected async Task UpdateImageAsync()
         {
diff --git a/MapControl/Shared/WmsImageLayer.cs b/MapControl/Shared/WmsImageLayer.cs
index a9c57672..06a6477d 100644
--- a/MapControl/Shared/WmsImageLayer.cs
+++ b/MapControl/Shared/WmsImageLayer.cs
@@ -5,6 +5,8 @@ using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Xml.Linq;
+using System.Diagnostics.Eventing.Reader;
+
 #if WPF
 using System.Windows;
 using System.Windows.Media;
@@ -160,7 +162,9 @@ namespace MapControl
         {
             string response = null;
 
-            if (ServiceUri != null && HasLayer)
+            if (ServiceUri != null && HasLayer && ParentMap != null &&
+                position.X >= 0d && position.X <= ParentMap.ActualWidth &&
+                position.Y >= 0d && position.Y <= ParentMap.ActualHeight)
             {
                 var uri = GetFeatureInfoRequestUri(position, format);
 
@@ -261,19 +265,25 @@ namespace MapControl
         /// </summary>
         protected virtual Uri GetFeatureInfoRequestUri(Point position, string format)
         {
-            var bbox = ParentMap.ViewRectToMap(0d, 0d, ParentMap.ActualWidth, ParentMap.ActualHeight);
-            var width = ParentMap.ViewTransform.Scale * bbox.Width;
-            var height = ParentMap.ViewTransform.Scale * bbox.Height;
+            var width = ParentMap.ActualWidth;
+            var height = ParentMap.ActualHeight;
+            var bbox = ParentMap.ViewRectToMap(0d, 0d, width, height);
+
+            if (ParentMap.ViewTransform.Rotation != 0d)
+            {
+                width = ParentMap.ViewTransform.Scale * bbox.Width;
+                height = ParentMap.ViewTransform.Scale * bbox.Height;
 #if AVALONIA
-            var transform = Matrix.CreateTranslation(-ParentMap.ActualWidth / 2d, -ParentMap.ActualHeight / 2d)
-                          * Matrix.CreateRotation(Matrix.ToRadians(-ParentMap.ViewTransform.Rotation))
-                          * Matrix.CreateTranslation(width / 2d, height / 2d);
+                var transform = Matrix.CreateTranslation(-ParentMap.ActualWidth / 2d, -ParentMap.ActualHeight / 2d)
+                              * Matrix.CreateRotation(Matrix.ToRadians(-ParentMap.ViewTransform.Rotation))
+                              * Matrix.CreateTranslation(width / 2d, height / 2d);
 #else
-            var transform = new Matrix(1d, 0d, 0d, 1d, -ParentMap.ActualWidth / 2d, -ParentMap.ActualHeight / 2d);
-            transform.Rotate(-ParentMap.ViewTransform.Rotation);
-            transform.Translate(width / 2d, height / 2d);
+                var transform = new Matrix(1d, 0d, 0d, 1d, -ParentMap.ActualWidth / 2d, -ParentMap.ActualHeight / 2d);
+                transform.Rotate(-ParentMap.ViewTransform.Rotation);
+                transform.Translate(width / 2d, height / 2d);
 #endif
-            var imagePos = transform.Transform(position);
+                position = transform.Transform(position);
+            }
 
             var queryParameters = new Dictionary<string, string>
             {
@@ -287,8 +297,8 @@ namespace MapControl
                 { "BBOX", GetBboxValue(bbox) },
                 { "WIDTH", width.ToString("F0") },
                 { "HEIGHT", height.ToString("F0") },
-                { "I", imagePos.X.ToString("F0") },
-                { "J", imagePos.Y.ToString("F0") }
+                { "I", position.X.ToString("F0") },
+                { "J", position.Y.ToString("F0") }
             };
 
             // GetRequestUri may modify queryParameters["LAYERS"].
diff --git a/MapControl/WinUI/Matrix.WinUI.cs b/MapControl/WinUI/Matrix.WinUI.cs
index 826a2790..d0fbd279 100644
--- a/MapControl/WinUI/Matrix.WinUI.cs
+++ b/MapControl/WinUI/Matrix.WinUI.cs
@@ -39,7 +39,7 @@ namespace MapControl
             return new Matrix(m.M11, m.M12, m.M21, m.M22, m.OffsetX, m.OffsetY);
         }
 
-        public Point Transform(Point p)
+        public readonly Point Transform(Point p)
         {
             return new Point(
                 M11 * p.X + M21 * p.Y + OffsetX,