diff --git a/MapControl/WPF/DrawingTile.WPF.cs b/MapControl/WPF/DrawingTile.WPF.cs
index 6bc26947..91cca19b 100644
--- a/MapControl/WPF/DrawingTile.WPF.cs
+++ b/MapControl/WPF/DrawingTile.WPF.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
@@ -9,26 +8,15 @@ namespace MapControl
 {
     public class DrawingTile : Tile
     {
-        private readonly ImageDrawing imageDrawing = new ImageDrawing();
-
         public DrawingTile(int zoomLevel, int x, int y, int columnCount)
             : base(zoomLevel, x, y, columnCount)
         {
-            Drawing.Children.Add(imageDrawing);
+            Drawing.Children.Add(ImageDrawing);
         }
 
         public DrawingGroup Drawing { get; } = new DrawingGroup();
 
-        public ImageSource ImageSource
-        {
-            get => imageDrawing.ImageSource;
-            set => imageDrawing.ImageSource = value;
-        }
-
-        public void SetRect(int xMin, int yMin, int tileWidth, int tileHeight)
-        {
-            imageDrawing.Rect = new Rect(tileWidth * (X - xMin), tileHeight * (Y - yMin), tileWidth, tileHeight);
-        }
+        public ImageDrawing ImageDrawing { get; } = new ImageDrawing();
 
         public override async Task LoadImageAsync(Func<Task<ImageSource>> loadImageFunc)
         {
@@ -36,7 +24,7 @@ namespace MapControl
 
             void SetImageSource()
             {
-                imageDrawing.ImageSource = image;
+                ImageDrawing.ImageSource = image;
 
                 if (image != null && MapBase.ImageFadeDuration > TimeSpan.Zero)
                 {
@@ -84,7 +72,7 @@ namespace MapControl
             bitmap.DownloadCompleted -= BitmapDownloadCompleted;
             bitmap.DownloadFailed -= BitmapDownloadFailed;
 
-            imageDrawing.ImageSource = null;
+            ImageDrawing.ImageSource = null;
         }
     }
 }
diff --git a/MapControl/WPF/DrawingTileMatrixLayer.WPF.cs b/MapControl/WPF/DrawingTileMatrixLayer.WPF.cs
index 94a6dffb..d5deb9ef 100644
--- a/MapControl/WPF/DrawingTileMatrixLayer.WPF.cs
+++ b/MapControl/WPF/DrawingTileMatrixLayer.WPF.cs
@@ -88,16 +88,20 @@ namespace MapControl
                     {
                         tile = new DrawingTile(TileMatrix.ZoomLevel, x, y, WmtsTileMatrix.MatrixWidth);
 
-                        var equivalentTile = Tiles.FirstOrDefault(t => t.ImageSource != null && t.Column == tile.Column && t.Row == tile.Row);
+                        var equivalentTile = Tiles.FirstOrDefault(t => t.ImageDrawing.ImageSource != null && t.Column == tile.Column && t.Row == tile.Row);
 
                         if (equivalentTile != null)
                         {
                             tile.IsPending = false;
-                            tile.ImageSource = equivalentTile.ImageSource; // no Opacity animation
+                            tile.ImageDrawing.ImageSource = equivalentTile.ImageDrawing.ImageSource; // no Opacity animation
                         }
                     }
 
-                    tile.SetRect(TileMatrix.XMin, TileMatrix.YMin, WmtsTileMatrix.TileWidth, WmtsTileMatrix.TileHeight);
+                    tile.ImageDrawing.Rect = new Rect(
+                        WmtsTileMatrix.TileWidth * (x - TileMatrix.XMin),
+                        WmtsTileMatrix.TileHeight * (y - TileMatrix.YMin),
+                        WmtsTileMatrix.TileWidth,
+                        WmtsTileMatrix.TileHeight);
 
                     tiles.Add(tile);
                     drawings.Add(tile.Drawing);