diff --git a/src/encode.c b/src/encode.c
index 4f6d508..df51d4b 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -85,8 +85,8 @@ word encodeDPImmediate(a64inst_instruction inst) {
     // if wide move
     else {
         setBits(&wrd, 23, 26, 0x5); //opi
-        // TODO: Check the following line, is it shiftScalar?:
-        setBits(&wrd, 21, 23, (data.processOpData.wideMovData.shiftScalar == 12)); // hw
+        uint8_t hw = data.processOpData.wideMovData.shiftScalar / 16;
+        setBits(&wrd, 21, 23, hw); // hw
         setBits(&wrd, 5, 21, data.processOpData.wideMovData.immediate); // imm16
     }