diff --git a/src/Kaleidoscope-Hardware-Model01.cpp b/src/Kaleidoscope-Hardware-Model01.cpp
index 1f2e8c7f..d23e63bc 100644
--- a/src/Kaleidoscope-Hardware-Model01.cpp
+++ b/src/Kaleidoscope-Hardware-Model01.cpp
@@ -5,8 +5,8 @@
 KeyboardioScanner Model01::leftHand(0);
 KeyboardioScanner Model01::rightHand(3);
 bool Model01::isLEDChanged = true;
-uint32_t Model01::leftHandMask;
-uint32_t Model01::rightHandMask;
+keydata_t Model01::leftHandMask;
+keydata_t Model01::rightHandMask;
 
 static constexpr uint8_t key_led_map[4][16] = {
   {3, 4, 11, 12, 19, 20, 26, 27,     36, 37, 43, 44, 51, 52, 59, 60},
@@ -209,9 +209,9 @@ void Model01::maskKey(byte row, byte col) {
     return;
 
   if (col >= 8) {
-    rightHandMask |= SCANBIT(row, col - 8);
+    rightHandMask.rows[row] |= 1 << (7 - (col - 8));
   } else {
-    leftHandMask |= SCANBIT(row, col);
+    leftHandMask.rows[row] |= 1 << (7 - col);
   }
 }
 
@@ -220,9 +220,9 @@ void Model01::unMaskKey(byte row, byte col) {
     return;
 
   if (col >= 8) {
-    rightHandMask &= ~(SCANBIT(row, col - 8));
+    rightHandMask.rows[row] &= ~(1 << (7 - (col - 8)));
   } else {
-    leftHandMask &= ~(SCANBIT(row, col));
+    leftHandMask.rows[row] &= ~(1 << (7 - col));
   }
 }
 
@@ -231,15 +231,15 @@ bool Model01::isKeyMasked(byte row, byte col) {
     return false;
 
   if (col >= 8) {
-    return rightHandMask & SCANBIT(row, col - 8);
+    return rightHandMask.rows[row] & (1 << (7 - (col - 8)));
   } else {
-    return leftHandMask & SCANBIT(row, col);
+    return leftHandMask.rows[row] & (1 << (7 - col));
   }
 }
 
 void Model01::maskHeldKeys(void) {
-  rightHandMask = rightHandState.all;
-  leftHandMask = leftHandState.all;
+  memcpy(leftHandMask.rows, leftHandState.rows, sizeof(leftHandMask));
+  memcpy(rightHandMask.rows, rightHandState.rows, sizeof(rightHandMask));
 }
 
 HARDWARE_IMPLEMENTATION KeyboardHardware;
diff --git a/src/Kaleidoscope-Hardware-Model01.h b/src/Kaleidoscope-Hardware-Model01.h
index e2fe552d..b652e66a 100644
--- a/src/Kaleidoscope-Hardware-Model01.h
+++ b/src/Kaleidoscope-Hardware-Model01.h
@@ -54,8 +54,8 @@ class Model01 {
   static KeyboardioScanner leftHand;
   static KeyboardioScanner rightHand;
 
-  static uint32_t leftHandMask;
-  static uint32_t rightHandMask;
+  static keydata_t leftHandMask;
+  static keydata_t rightHandMask;
 };
 
 #define SCANBIT(row,col) ((uint32_t)1 << ((row) * 8 + (7 - (col))))