diff --git a/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp
index 534a34e3..16ee7613 100644
--- a/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp
+++ b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.cpp
@@ -362,42 +362,32 @@ void RGBFusion2USBController::SetLEDEffect(unsigned int led, int mode, unsigned
     pkt.e.effect_type   = mode;
     pkt.e.color0        = r << 16 | g << 8 | b;
 
-    if(speed < speeds.size())
-    {
-        const std::array<int, 3>& s = speeds[speed];
-
-        pkt.e.period0 = s[0];
-        pkt.e.period1 = s[1];
-        pkt.e.period2 = s[2];
-    }
-
     pkt.e.max_brightness = brightness;
 
     switch(mode)
     {
-        case 0:
+        case 0: // Direct
+        case 1: // Static
             break;
 
-        // Static
-        case 1:
-            break;
+        case 2: //Breathing
+        case 3: //Blink
+        case 4: // Color Cycle
+            if(speed < speeds.size())
+            {
+                const std::array<int, 3>& s = speeds[speed];
 
-        // Breathing
-        case 2:
+                pkt.e.period0 = s[0];
+                pkt.e.period1 = s[1];
+                pkt.e.period2 = s[2];
+            }
 
-        // Blink
-        case 3:
             if(random)
             {
                 pkt.e.effect_param0 = 7; // cycle through up to 7 (max?) colors
             }
             break;
 
-        // Color Cycle
-        case 4:
-            pkt.e.effect_param0 = 7; // cycle through up to 7 (max?) colors
-            break;
-
         // "Fake" effects
         case 10: // flashing, flashing color cycle
             pkt.e.period0       = 200;
diff --git a/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h
index 11524eba..14e1bf77 100644
--- a/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h
+++ b/Controllers/GigabyteRGBFusion2USBController/GigabyteRGBFusion2USBController.h
@@ -175,7 +175,7 @@ union PktEffect
         e.max_brightness    = 100;
         e.min_brightness    = 0;
         e.color0            = 0x00FF2100;   //orange
-        e.period0           = 1200;
+        e.period0           = 0;            //Rising Timer - Needs to be 0 for "Direct"
         e.period1           = 1200;
         e.period2           = 200;
         e.period3           = 200;
diff --git a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp
index d7fd8ebd..59b81149 100644
--- a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp
+++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp
@@ -533,8 +533,8 @@ void RGBController_RGBFusion2USB::UpdateZoneLEDs(int zone)
     /*---------------------------------------------------------*\
     | Get mode parameters                                       |
     \*---------------------------------------------------------*/
-    bool    random      = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);
     int     mode_value  = (modes[active_mode].value);
+    bool    random      = (modes[active_mode].color_mode == MODE_COLORS_RANDOM || mode_value == EFFECT_COLORCYCLE);
 
     /*---------------------------------------------------------*\
     | Set motherboard LEDs                                      |