diff --git a/src/uxnasm.c b/src/uxnasm.c
index 03cc333..a96f49b 100644
--- a/src/uxnasm.c
+++ b/src/uxnasm.c
@@ -217,14 +217,12 @@ writeopcode(char *w)
 {
 	Uint8 res;
 	if(jsrlast && scmp(w, "JMP2r", 5)) { /* tail-call optimization */
-		p.data[p.ptr - 1] = jsrlast == 2 ? findopcode("JMP2") : findopcode("JMP");
+		p.data[p.ptr - 1] = findopcode("JMP2");
 		jsrlast = 0;
 		return 1;
 	}
 	res = writebyte(findopcode(w));
 	if(scmp(w, "JSR2", 4))
-		jsrlast = 2;
-	else if(scmp(w, "JSR", 3))
 		jsrlast = 1;
 	return res;
 }