diff --git a/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.cpp
index 86ad5a1..5103c9b 100644
--- a/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.cpp
+++ b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.cpp
@@ -137,25 +137,50 @@ void DigitalInputCard::handlePinChange(int pin, uint8_t &currentBuffer, uint8_t
     // Handle Bank A
     if (((previousBuffer >> (7 - pin)) & 1) != ((currentBuffer >> (7 - pin)) & 1))
     {
-        if (millis() - lastDebounceTime[pin] > debounceTime[pin])
-        {
+        if (!pinChanged[pin]) {
             lastDebounceTime[pin] = millis();
-            previousBuffer ^= (-((currentBuffer >> (7 - pin)) & 1) ^ previousBuffer) & (1UL << (7 - pin));
-            for(const auto& callback : callbacks)
-                callback.second(virtualPin, ((currentBuffer >> (7 - pin)) & 1));
+            pinChanged[pin] = true;
+        } else {
+            if (millis() - lastDebounceTime[pin] > debounceTime[pin])
+            {
+                previousBuffer ^= (-((currentBuffer >> (7 - pin)) & 1) ^ previousBuffer) & (1UL << (7 - pin));
+                for (const auto& callback : callbacks)
+                    callback.second(virtualPin, ((currentBuffer >> (7 - pin)) & 1));
+                pinChanged[pin] = false;
+            }
         }
     }
     // Handle Bank B
     if (((previousBuffer >> (15 - pin)) & 1) != ((currentBuffer >> (15 - pin)) & 1))
     {
-        if (millis() - lastDebounceTime[pin] > debounceTime[pin])
-        {
+        if (!pinChanged[pin]) {
             lastDebounceTime[pin] = millis();
-            previousBuffer ^= (-((currentBuffer >> (15 - pin)) & 1) ^ previousBuffer) & (1UL << (15 - pin));
-            for (const auto& callback : callbacks)
-                callback.second(virtualPin, ((currentBuffer >> (15 - pin)) & 1));
+            pinChanged[pin] = true;
+        } else {
+            if (millis() - lastDebounceTime[pin] > debounceTime[pin])
+            {
+                previousBuffer ^= (-((currentBuffer >> (15 - pin)) & 1) ^ previousBuffer) & (1UL << (15 - pin));
+                for (const auto& callback : callbacks)
+                    callback.second(virtualPin, ((currentBuffer >> (15 - pin)) & 1));
+                pinChanged[pin] = false;
+            }
         }
     }
+    
+
+
+    // // Handle Bank B
+    // if (((previousBuffer >> (15 - pin)) & 1) != ((currentBuffer >> (15 - pin)) & 1))
+    // {
+    //     if (millis() - lastDebounceTime[pin] > debounceTime[pin])
+    //     {
+    //         lastDebounceTime[pin] = millis();
+    //         previousBuffer ^= (-((currentBuffer >> (15 - pin)) & 1) ^ previousBuffer) & (1UL << (15 - pin));
+    //         for (const auto& callback : callbacks)
+    //             callback.second(virtualPin, ((currentBuffer >> (15 - pin)) & 1));
+    //     }
+    // }
+
 }
 
 /**
diff --git a/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.hpp
index a140029..3ba7805 100644
--- a/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.hpp
+++ b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.hpp
@@ -54,6 +54,7 @@ class DigitalInputCard : public ExpansionCard {
         uint8_t previousInputBufferB;
         uint32_t debounceTime[16];
         uint32_t lastDebounceTime[16];
+        bool pinChanged[16];
         // A map of the physical pin to the virtual pin
         uint8_t pinMap[16];
         // A map of the virtual pin to the physical pin