diff --git a/lib/fast486/opgroups.c b/lib/fast486/opgroups.c
index a944e8d8939..a721c89bb36 100644
--- a/lib/fast486/opgroups.c
+++ b/lib/fast486/opgroups.c
@@ -167,7 +167,11 @@ Fast486RotateOperation(PFAST486_STATE State,
     Count &= 0x1F;
 
     /* If the count is zero, do nothing */
-    if (Count == 0) goto SetFlags;
+    if (Count == 0)
+    {
+        Result = Value;
+        goto SetFlags;
+    }
 
     /* Check which operation is this */
     switch (Operation)