diff --git a/examples/seesaw_shield18_test/seesaw_shield18_test.ino b/examples/seesaw_shield18_test/seesaw_shield18_test.ino
index 17d225c..02bf727 100644
--- a/examples/seesaw_shield18_test/seesaw_shield18_test.ino
+++ b/examples/seesaw_shield18_test/seesaw_shield18_test.ino
@@ -244,7 +244,6 @@ void bmpDraw(char *filename, uint8_t x, uint16_t y) {
         // Set TFT address window to clipped image bounds
         tft.startWrite();
         tft.setAddrWindow(x, y, w, h);
-        tft.endWrite();
 
         for (row=0; row<h; row++) { // For each scanline...
 
@@ -259,6 +258,7 @@ void bmpDraw(char *filename, uint8_t x, uint16_t y) {
           else     // Bitmap is stored top-to-bottom
             pos = bmpImageoffset + row * rowSize;
           if(bmpFile.position() != pos) { // Need seek?
+            tft.endWrite();
             bmpFile.seek(pos);
             buffidx = sizeof(sdbuffer); // Force buffer reload
           }
@@ -268,6 +268,7 @@ void bmpDraw(char *filename, uint8_t x, uint16_t y) {
             if (buffidx >= sizeof(sdbuffer)) { // Indeed
               bmpFile.read(sdbuffer, sizeof(sdbuffer));
               buffidx = 0; // Set index to beginning
+              tft.startWrite();
             }
 
             // Convert pixel from BMP to TFT format, push to display
diff --git a/examples/shieldtest/shieldtest.ino b/examples/shieldtest/shieldtest.ino
index c5935c1..1bf032a 100644
--- a/examples/shieldtest/shieldtest.ino
+++ b/examples/shieldtest/shieldtest.ino
@@ -191,7 +191,8 @@ void bmpDraw(char *filename, uint8_t x, uint8_t y) {
         if((y+h-1) >= tft.height()) h = tft.height() - y;
 
         // Set TFT address window to clipped image bounds
-        tft.setAddrWindow(x, y, x+w-1, y+h-1);
+        tft.startWrite();
+        tft.setAddrWindow(x, y, w, h);
 
         for (row=0; row<h; row++) { // For each scanline...
 
@@ -206,6 +207,7 @@ void bmpDraw(char *filename, uint8_t x, uint8_t y) {
           else     // Bitmap is stored top-to-bottom
             pos = bmpImageoffset + row * rowSize;
           if(bmpFile.position() != pos) { // Need seek?
+            tft.endWrite();
             bmpFile.seek(pos);
             buffidx = sizeof(sdbuffer); // Force buffer reload
           }
@@ -215,6 +217,7 @@ void bmpDraw(char *filename, uint8_t x, uint8_t y) {
             if (buffidx >= sizeof(sdbuffer)) { // Indeed
               bmpFile.read(sdbuffer, sizeof(sdbuffer));
               buffidx = 0; // Set index to beginning
+              tft.startWrite();
             }
 
             // Convert pixel from BMP to TFT format, push to display
@@ -224,6 +227,7 @@ void bmpDraw(char *filename, uint8_t x, uint8_t y) {
             tft.pushColor(tft.color565(r,g,b));
           } // end pixel
         } // end scanline
+        tft.endWrite();
         Serial.print("Loaded in ");
         Serial.print(millis() - startTime);
         Serial.println(" ms");
diff --git a/examples/spitftbitmap/spitftbitmap.ino b/examples/spitftbitmap/spitftbitmap.ino
index 090b2c1..d890528 100644
--- a/examples/spitftbitmap/spitftbitmap.ino
+++ b/examples/spitftbitmap/spitftbitmap.ino
@@ -175,7 +175,8 @@ void bmpDraw(char *filename, uint8_t x, uint16_t y) {
         if((y+h-1) >= tft.height()) h = tft.height() - y;
 
         // Set TFT address window to clipped image bounds
-        tft.setAddrWindow(x, y, x+w-1, y+h-1);
+        tft.startWrite();
+        tft.setAddrWindow(x, y, w, h);
 
         for (row=0; row<h; row++) { // For each scanline...
 
@@ -190,6 +191,7 @@ void bmpDraw(char *filename, uint8_t x, uint16_t y) {
           else     // Bitmap is stored top-to-bottom
             pos = bmpImageoffset + row * rowSize;
           if(bmpFile.position() != pos) { // Need seek?
+            tft.endWrite();
             bmpFile.seek(pos);
             buffidx = sizeof(sdbuffer); // Force buffer reload
           }
@@ -199,6 +201,7 @@ void bmpDraw(char *filename, uint8_t x, uint16_t y) {
             if (buffidx >= sizeof(sdbuffer)) { // Indeed
               bmpFile.read(sdbuffer, sizeof(sdbuffer));
               buffidx = 0; // Set index to beginning
+              tft.startWrite();
             }
 
             // Convert pixel from BMP to TFT format, push to display
@@ -208,6 +211,7 @@ void bmpDraw(char *filename, uint8_t x, uint16_t y) {
             tft.pushColor(tft.color565(r,g,b));
           } // end pixel
         } // end scanline
+        tft.endWrite();
         Serial.print(F("Loaded in "));
         Serial.print(millis() - startTime);
         Serial.println(" ms");
diff --git a/library.properties b/library.properties
index 58337a1..ab8c3dd 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit ST7735 and ST7789 Library
-version=1.2.4
+version=1.2.5
 author=Adafruit
 maintainer=Adafruit <info@adafruit.com>
 sentence=This is a library for the Adafruit ST7735 and ST7789 SPI displays.