diff --git a/EightBit/IntelOpCodeDecoded.cs b/EightBit/IntelOpCodeDecoded.cs
index 905f40d..d680444 100644
--- a/EightBit/IntelOpCodeDecoded.cs
+++ b/EightBit/IntelOpCodeDecoded.cs
@@ -10,9 +10,9 @@ namespace EightBit
         {
             this.X = (opCode & 0b11000000) >> 6;    // 0 - 3
             this.Y = (opCode & 0b00111000) >> 3;    // 0 - 7
-            this.Z = opCode & 0b00000111;           // 0 - 7
+            this.Z = (opCode & 0b00000111);         // 0 - 7
             this.P = (this.Y & 0b110) >> 1;         // 0 - 3
-            this.Q = this.Y & 0b1;                  // 0 - 1
+            this.Q = (this.Y & 0b001);              // 0 - 1
         }
 
         public int X { get; }