diff --git a/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp b/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp
index 4c68ae4d0..46c4dac7c 100644
--- a/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp
+++ b/Controllers/PatriotViperController/PatriotViperControllerDetect.cpp
@@ -12,6 +12,32 @@
 using namespace std::chrono_literals;
 #define PATRIOT_CONTROLLER_NAME "Patriot Viper"
 
+/******************************************************************************************\
+*                                                                                          *
+*   TestForPatriotViperController                                                          *
+*                                                                                          *
+*       Tests the given address to see if a Patriot Viper controller exists there.         *
+*                                                                                          *
+\******************************************************************************************/
+
+bool TestForPatriotViperController(i2c_smbus_interface* bus, unsigned char address)
+{
+    bool pass = false;
+
+    int res = bus->i2c_smbus_write_quick(address, I2C_SMBUS_WRITE);
+
+    LOG_DEBUG("[%s] Writing at address %02X, res=%02X", PATRIOT_CONTROLLER_NAME, address, res);
+
+    if (res >= 0)
+    {
+        pass = true;
+    }
+
+    return(pass);
+
+}   /* TestForPatriotViperController() */
+
+
 /******************************************************************************************\
 *                                                                                          *
 *   DetectPatriotViperControllers                                                          *
@@ -34,57 +60,55 @@ void DetectPatriotViperControllers(std::vector<i2c_smbus_interface*> &busses)
 
         IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
         {
-            int res = busses[bus]->i2c_smbus_read_byte_data(0x36, 0x00);
+            // Check for Patriot Viper controller at 0x77
+            LOG_DEBUG("[%s] Testing bus %d at address 0x77", PATRIOT_CONTROLLER_NAME, bus);
 
-            if(res < 0)
+            if(TestForPatriotViperController(busses[bus], 0x77))
             {
-                continue;
-            }
-            std::this_thread::sleep_for(1ms);
-
-            for(int slot_addr = 0x50; slot_addr <= 0x57; slot_addr++)
-            {
-                // Test for Patriot Viper RGB SPD at slot_addr
-                // This test was copied from Viper RGB software
-                // Tests SPD addresses in order: 0x00, 0x40, 0x41, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68
-
-                busses[bus]->i2c_smbus_write_byte_data(0x36, 0x00, 0xFF);
-
-                std::this_thread::sleep_for(1ms);
-
-                int res = busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x00);
-
-                LOG_DEBUG("[%s] Trying to read 0x%02X RAM module data at 0x00 expect: 0x23 res: %02X", PATRIOT_CONTROLLER_NAME, slot_addr, res);
-                if(res == 0x23)
+                for(int slot_addr = 0x50; slot_addr <= 0x57; slot_addr++)
                 {
-                    busses[bus]->i2c_smbus_write_byte_data(0x37, 0x00, 0xFF);
+                    // Test for Patriot Viper RGB SPD at slot_addr
+                    // This test was copied from Viper RGB software
+                    // Tests SPD addresses in order: 0x00, 0x40, 0x41, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68
+
+                    busses[bus]->i2c_smbus_write_byte_data(0x36, 0x00, 0xFF);
 
                     std::this_thread::sleep_for(1ms);
 
-                    if((busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x40) == 0x85)
-                    &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x41) == 0x02)
-                    &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x61) == 0x4D)
-                    &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x62) == 0x49)
-                    &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x63) == 0x43)
-                    &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x64) == 0x53)
-                    &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x65) == 0x59)
-                    &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x66) == 0x53)
-                    &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x67) == 0x5f)
-                    &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x68) == 0x44))
+                    int res = busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x00);
+
+                    LOG_DEBUG("[%s] Trying to read 0x%02X RAM module data at 0x00 expect: 0x23 res: %02X", PATRIOT_CONTROLLER_NAME, slot_addr, res);
+                    if(res == 0x23)
                     {
-                        LOG_DEBUG("[%s] The 0x%02X RAM module detected", PATRIOT_CONTROLLER_NAME, slot_addr);
-                        slots_valid |= (1 << (slot_addr - 0x50));
+                        busses[bus]->i2c_smbus_write_byte_data(0x37, 0x00, 0xFF);
+
+                        std::this_thread::sleep_for(1ms);
+
+                        if((busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x40) == 0x85)
+                        &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x41) == 0x02)
+                        &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x61) == 0x4D)
+                        &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x62) == 0x49)
+                        &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x63) == 0x43)
+                        &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x64) == 0x53)
+                        &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x65) == 0x59)
+                        &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x66) == 0x53)
+                        &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x67) == 0x5f)
+                        &&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x68) == 0x44))
+                        {
+                            LOG_DEBUG("[%s] The 0x%02X RAM module detected", PATRIOT_CONTROLLER_NAME, slot_addr);
+                            slots_valid |= (1 << (slot_addr - 0x50));
+                        }
                     }
+
+                    std::this_thread::sleep_for(1ms);
                 }
 
-                std::this_thread::sleep_for(1ms);
-            }
-
-            if(slots_valid != 0)
-            {
-                new_viper = new PatriotViperController(busses[bus], 0x77, slots_valid);
-                new_controller = new RGBController_PatriotViper(new_viper);
-                ResourceManager::get()->RegisterRGBController(new_controller);
+                if(slots_valid != 0)
+                {
+                    new_viper = new PatriotViperController(busses[bus], 0x77, slots_valid);
+                    new_controller = new RGBController_PatriotViper(new_viper);
+                    ResourceManager::get()->RegisterRGBController(new_controller);
+                }
             }
         }
     }