diff --git a/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp b/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
index 2c2a862..d91372b 100644
--- a/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
+++ b/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp
@@ -82,14 +82,12 @@ void DriverBoardPinController::clear()
   for(auto mux : mux_enable_pins)
   {
     select_mux(mux);
+    for(uint8_t i = 0; i<8; i++)
+    {
+      select_address(i);
+    }
+    this->deselect_all_muxes();
   }
-
-  for(uint8_t i = 0; i<8; i++)
-  {
-    select_address(i);
-  }
-  
-  this->deselect_all_muxes();
 }
 
 void DriverBoardPinController::set_address_pins(std::array<uint8_t, 3> address_pins)