diff --git a/lundump.h b/lundump.h
index f3748a99..bc71ced8 100644
--- a/lundump.h
+++ b/lundump.h
@@ -21,8 +21,7 @@
 /*
 ** Encode major-minor version in one byte, one nibble for each
 */
-#define MYINT(s)	(s[0]-'0')  /* assume one-digit numerals */
-#define LUAC_VERSION	(MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR))
+#define LUAC_VERSION	(LUA_VERSION_MAJOR_N*16+LUA_VERSION_MINOR_N)
 
 #define LUAC_FORMAT	0	/* this is the official format */
 
diff --git a/testes/calls.lua b/testes/calls.lua
index 2d562a24..664be1b4 100644
--- a/testes/calls.lua
+++ b/testes/calls.lua
@@ -342,7 +342,7 @@ do   -- another bug (in 5.4.0)
 end
 
 
-do   -- another bug (since 5.2)
+if not _port then   -- another bug (since 5.2)
   -- corrupted binary dump: list of upvalue names is larger than number
   -- of upvalues, overflowing the array of upvalues.
   local code =