diff --git a/wip-duuqnd/user-side-compiler/backend/code-generator.lisp b/wip-duuqnd/user-side-compiler/backend/code-generator.lisp
index c06059e..7862965 100644
--- a/wip-duuqnd/user-side-compiler/backend/code-generator.lisp
+++ b/wip-duuqnd/user-side-compiler/backend/code-generator.lisp
@@ -219,10 +219,9 @@
   (let ((address origin-address))
     (loop :for asm-obj := start-instruction :then (next asm-obj)
           :until (null asm-obj)
-          :do (cond ((typep asm-obj 'asm-label)
-                     (setf (address asm-obj) address))
-                    ((typep asm-obj 'asm-instruction)
-                     (incf address (byte-length asm-obj)))))
+          :do (setf (address asm-obj) address)
+          :when (typep asm-obj 'asm-instruction)
+            :do (incf address (byte-length asm-obj)))
     (values start-instruction address)))
 
 (defun link-assembly (start-instruction origin-address)