diff --git a/Z80/src/Z80.cpp b/Z80/src/Z80.cpp
index 8a4a143..48e5e32 100644
--- a/Z80/src/Z80.cpp
+++ b/Z80/src/Z80.cpp
@@ -911,11 +911,13 @@ void EightBit::Z80::executeCB(int x, int y, int z, int p, int q) {
 			}
 			break;
 		}
-		if (m_prefixDD || m_prefixFD) {
+		if (m_prefixDD || m_prefixFD)
 			adjustSZP(DISPLACED());
+		else
+			adjustSZP(R(z));
+		if (m_prefixDD || m_prefixFD) {
 			cycles += 23;
 		} else {
-			adjustSZP(R(z));
 			cycles += 8;
 			if (z == 6)
 				cycles += 7;