@@ -283,18 +283,14 @@ def test_image_mask_RGBa(self, mode: str) -> None:
             ],
         )
 
-    @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
+    @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L", "I;16"])
     def test_color_solid(self, mode: str) -> None:
         im = Image.new(mode, (200, 200), "black")
 
         rect = (12, 23, 128 + 12, 128 + 23)
         im.paste("white", rect)
 
-        hist = im.crop(rect).histogram()
-        while hist:
-            head, hist = hist[:256], hist[256:]
-            assert head[255] == 128 * 128
-            assert sum(head[:255]) == 0
+        assert_image_equal(im.crop(rect), Image.new(mode, (128, 128), "white"))
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
     def test_color_mask_1(self, mode: str) -> None:
@@ -326,9 +322,7 @@ def test_color_mask_1_I16(self) -> None:
             im,
             (color,),
             self.mask_1,
-            [
-                50, 50, 10, 50, 50, 10, 10, 10, 50
-            ],
+            [50, 50, 10, 50, 50, 10, 10, 10, 50],
         )
 
     @pytest.mark.parametrize("mode", ["RGBA", "RGB", "L"])
 
@@ -372,19 +372,29 @@ fill(
     /* fill opaque region */
 
     int x, y;
-    UINT8 ink8 = 0;
     INT32 ink32 = 0L;
 
     memcpy(&ink32, ink, pixelsize);
-    memcpy(&ink8, ink, sizeof(ink8));
 
     if (imOut->image8 || ink32 == 0L) {
-        dx *= pixelsize;
-        xsize *= pixelsize;
-        for (y = 0; y < ysize; y++) {
-            memset(imOut->image[y + dy] + dx, ink8, xsize);
+        int i16 = imOut->type == IMAGING_TYPE_I16;
+        if (i16 && ink32 != 0L) {
+            for (y = 0; y < ysize; y++) {
+                UINT16 *out = (UINT16 *)imOut->image[y + dy] + dx;
+                for (x = 0; x < xsize; x++) {
+                    *out++ = ink32;
+                }
+            }
+        } else {
+            UINT8 ink8 = 0;
+            memcpy(&ink8, ink, sizeof(ink8));
+
+            dx *= pixelsize;
+            xsize *= pixelsize;
+            for (y = 0; y < ysize; y++) {
+                memset(imOut->image[y + dy] + dx, ink8, xsize);
+            }
         }
-
     } else {
 #if defined _WIN32 && !defined _WIN64
         int i;