diff --git a/src/rars/assembler/Assembler.java b/src/rars/assembler/Assembler.java
index e4dc2164..9b7e6c68 100644
--- a/src/rars/assembler/Assembler.java
+++ b/src/rars/assembler/Assembler.java
@@ -488,7 +488,7 @@ private ArrayList<ProgramStatement> parseLine(TokenList tokenList, String source
                         "Extended (pseudo) instruction or format not permitted.  See Settings."));
             }
             if (OperandFormat.tokenOperandMatch(tokens, inst, errors)) {
-                programStatement = new ProgramStatement(this.fileCurrentlyBeingAssembled, source,
+                programStatement = new ProgramStatement(token.getOriginalProgram(), source,
                         tokenList, tokens, inst, textAddress.get(), sourceLineNumber);
                 // instruction length is 4 for all basic instruction, varies for extended instruction
                 // Modified to permit use of compact expansion if address fits
diff --git a/src/rars/assembler/SourceLine.java b/src/rars/assembler/SourceLine.java
index a0fdcf47..fa19d5c7 100644
--- a/src/rars/assembler/SourceLine.java
+++ b/src/rars/assembler/SourceLine.java
@@ -97,4 +97,4 @@ public int getLineNumber() {
     public RISCVprogram getRISCVprogram() {
         return program;
     }
-}
\ No newline at end of file
+}