diff --git a/prebuilt/firmware.bin b/prebuilt/firmware.bin
index 0e34bb6c891c550536004cd1efe66f3a144de61b..52f1b8c66c3f03d67aa9d06da4c97a610652562d 100644
Binary files a/prebuilt/firmware.bin and b/prebuilt/firmware.bin differ
diff --git a/prebuilt/spiffs.bin b/prebuilt/spiffs.bin
index c8381ee22138b40979a0f6582b2f66f006243bcb..a895481270cc944e3c970987d013bb0a50269a60 100644
Binary files a/prebuilt/spiffs.bin and b/prebuilt/spiffs.bin differ
diff --git a/smartpower2/smartpower2.ino b/smartpower2/smartpower2.ino
index ce5d7ad52cc1eb43755a31061ee1446b2e642e79..d3f22e8a4603784e2ad0d85fe078727a9d140db1 100644
--- a/smartpower2/smartpower2.ino
+++ b/smartpower2/smartpower2.ino
@@ -41,7 +41,7 @@ WiFiClient logClient;
 #define MEASUREWATTHOUR		'm'
 #define FW_VERSION			'f'
 
-#define FWversion	1.5
+#define FWversion	1.6
 
 uint8_t onoff = OFF;
 unsigned char measureWh;
@@ -660,7 +660,7 @@ unsigned long currtime;
 unsigned char btnChanged;
 unsigned char resetCnt;
 unsigned char swlock;
-void pinChanged()
+ICACHE_RAM_ATTR void pinChanged()
 {
     if ((millis() - currtime) > 30) {
         swlock = 0;