diff --git a/iasm/assemble.c b/iasm/assemble.c
index 0b2ed97..80b1982 100755
--- a/iasm/assemble.c
+++ b/iasm/assemble.c
@@ -404,6 +404,7 @@ delimfields(char *buffer,
             ++chptr;
         if (*chptr)
             *(chptr++) = '\0';
+        strupper(*label);
     }
 
     /* if not off end of buffer, look for opcode */
@@ -426,7 +427,7 @@ delimfields(char *buffer,
                     ++chptr;
                 if (*chptr)
                     *(chptr++) = '\0';
-
+                strupper(*opcode);
             }
         }
     }
@@ -451,19 +452,13 @@ delimfields(char *buffer,
                     ++chptr;
                 if (*chptr)
                     *(chptr++) = '\0';
+                strupper(*field);
             }
         }
     }
 
     if (*chptr == ';')
         *comment = chptr;
-
-    if (*label)
-        strupper(*label);
-    if (*opcode)
-        strupper(*opcode);
-    if (*field)
-        strupper(*field);
 }
 
 
diff --git a/iasm/test.asm b/iasm/test.asm
index 5ed7ef2..6789fca 100755
--- a/iasm/test.asm
+++ b/iasm/test.asm
@@ -1,7 +1,7 @@
 ;-------------------------------
 ; Just loop in place - CPU speed test.
 ;-------------------------------
-	org	0100		; 
-start	jmp	start		; 
+        org     0100           ; 
+start   jmp     start          ; 
 ;-------------------------------
-	end     start
+        end     ;start
diff --git a/iasm/test.ptp b/iasm/test.ptp
index cca5016..7dffdda 100644
Binary files a/iasm/test.ptp and b/iasm/test.ptp differ