diff --git a/Processors/TFT_eSPI_ESP32.h b/Processors/TFT_eSPI_ESP32.h
index 9c6dc74..cd9548d 100644
--- a/Processors/TFT_eSPI_ESP32.h
+++ b/Processors/TFT_eSPI_ESP32.h
@@ -12,21 +12,6 @@
 #include "soc/spi_reg.h"
 #include "driver/spi_master.h"
 
-// Processor specific code used by SPI bus transaction startWrite and endWrite functions
-#if !defined (ESP32_PARALLEL)
-  #if (TFT_SPI_MODE == SPI_MODE1) || (TFT_SPI_MODE == SPI_MODE2)
-    #define SET_BUS_WRITE_MODE *_spi_user = SPI_USR_MOSI | SPI_CK_OUT_EDGE
-    #define SET_BUS_READ_MODE  *_spi_user = SPI_USR_MOSI | SPI_USR_MISO | SPI_DOUTDIN | SPI_CK_OUT_EDGE
-  #else
-    #define SET_BUS_WRITE_MODE *_spi_user = SPI_USR_MOSI
-    #define SET_BUS_READ_MODE  *_spi_user = SPI_USR_MOSI | SPI_USR_MISO | SPI_DOUTDIN
-  #endif
-#else
-    // Not applicable to parallel bus
-    #define SET_BUS_WRITE_MODE
-    #define SET_BUS_READ_MODE
-#endif
-
 // SUPPORT_TRANSACTIONS is mandatory for ESP32 so the hal mutex is toggled
 #if !defined (SUPPORT_TRANSACTIONS)
   #define SUPPORT_TRANSACTIONS
@@ -62,6 +47,21 @@
   #endif
 #endif
 
+// Processor specific code used by SPI bus transaction startWrite and endWrite functions
+#if !defined (ESP32_PARALLEL)
+  #if (TFT_SPI_MODE == SPI_MODE1) || (TFT_SPI_MODE == SPI_MODE2)
+    #define SET_BUS_WRITE_MODE *_spi_user = SPI_USR_MOSI | SPI_CK_OUT_EDGE
+    #define SET_BUS_READ_MODE  *_spi_user = SPI_USR_MOSI | SPI_USR_MISO | SPI_DOUTDIN | SPI_CK_OUT_EDGE
+  #else
+    #define SET_BUS_WRITE_MODE *_spi_user = SPI_USR_MOSI
+    #define SET_BUS_READ_MODE  *_spi_user = SPI_USR_MOSI | SPI_USR_MISO | SPI_DOUTDIN
+  #endif
+#else
+    // Not applicable to parallel bus
+    #define SET_BUS_WRITE_MODE
+    #define SET_BUS_READ_MODE
+#endif
+
 // Code to check if DMA is busy, used by SPI bus transaction transaction and endWrite functions
 #if !defined(TFT_PARALLEL_8_BIT) && !defined(SPI_18BIT_DRIVER)
   #define ESP32_DMA
diff --git a/TFT_eSPI.h b/TFT_eSPI.h
index 6d25d68..65b7195 100644
--- a/TFT_eSPI.h
+++ b/TFT_eSPI.h
@@ -16,7 +16,7 @@
 #ifndef _TFT_eSPIH_
 #define _TFT_eSPIH_
 
-#define TFT_ESPI_VERSION "2.3.57"
+#define TFT_ESPI_VERSION "2.3.58"
 
 // Bit level feature flags
 // Bit 0 set: viewport capability
diff --git a/library.json b/library.json
index 15bfce0..66d2413 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "TFT_eSPI",
-  "version": "2.3.57",
+  "version": "2.3.58",
   "keywords": "Arduino, tft, ePaper, display, STM32, ESP8266, NodeMCU, ESP32, M5Stack, ILI9341, ST7735, ILI9163, S6D02A1, ILI9486, ST7789, RM68140",
   "description": "A TFT and ePaper SPI graphics library with optimisation for ESP8266, ESP32 and STM32",
   "repository":
diff --git a/library.properties b/library.properties
index d2e1a9a..ee999c6 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=TFT_eSPI
-version=2.3.57
+version=2.3.58
 author=Bodmer
 maintainer=Bodmer
 sentence=TFT graphics library for Arduino processors with performance optimisation for STM32, ESP8266 and ESP32