diff --git a/asmparse.py b/asmparse.py
index 934422842..045a66c58 100755
--- a/asmparse.py
+++ b/asmparse.py
@@ -525,7 +525,6 @@ def declare_label(self, label, lineno, value=None, local=False, namespace=None):
             self.local_labels[-1][ex_label] = Label(ex_label, lineno, value, local, namespace, is_address)
 
         self.set_memory_slot()
-        self.memory_bytes[self.org] += ('%s:' % ex_label,)
 
         return self.local_labels[-1][ex_label]
 
diff --git a/tests/functional/orgasm.asm b/tests/functional/orgasm.asm
new file mode 100644
index 000000000..20137aebe
--- /dev/null
+++ b/tests/functional/orgasm.asm
@@ -0,0 +1,15 @@
+	org 32768
+__START_PROGRAM:
+	di
+	exx
+	ld hl, 0
+
+    ;org 32768
+    halt
+    halt
+
+__END_PROGRAM:
+__END_PERA:
+    nop
+__ENDPINA:
+	END
diff --git a/tests/functional/orgasm.bin b/tests/functional/orgasm.bin
new file mode 100644
index 000000000..bee12b0d0
Binary files /dev/null and b/tests/functional/orgasm.bin differ