diff --git a/src/uxn.c b/src/uxn.c
index 1dd378e..64823b7 100644
--- a/src/uxn.c
+++ b/src/uxn.c
@@ -12,9 +12,9 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE.
 */
 
-#define MODE_RETURN 0x20
-#define MODE_SHORT 0x40
-#define MODE_KEEP 0x80
+#define MODE_SHORT  0x20
+#define MODE_RETURN 0x40
+#define MODE_KEEP   0x80
 
 #pragma mark - Operations
 
diff --git a/src/uxnasm.c b/src/uxnasm.c
index becd9fe..52a11bb 100644
--- a/src/uxnasm.c
+++ b/src/uxnasm.c
@@ -88,10 +88,10 @@ findopcode(char *s)
 		if(!scmp(ops[i], s, 3))
 			continue;
 		while(s[3 + m]) {
-			if(s[3 + m] == 'r')
-				i |= (1 << 5); /* mode: return */
-			else if(s[3 + m] == '2')
-				i |= (1 << 6); /* mode: short */
+			if(s[3 + m] == '2')
+				i |= (1 << 5); /* mode: short */
+			else if(s[3 + m] == 'r')
+				i |= (1 << 6); /* mode: return */
 			else if(s[3 + m] == 'k')
 				i |= (1 << 7); /* mode: keep */
 			else