diff --git a/source/scriptinterface/NativeWrapperDefns.h b/source/scriptinterface/NativeWrapperDefns.h
index ab8238bc17..7f156fb9d5 100644
--- a/source/scriptinterface/NativeWrapperDefns.h
+++ b/source/scriptinterface/NativeWrapperDefns.h
@@ -151,7 +151,7 @@ BOOST_PP_REPEAT(SCRIPT_INTERFACE_MAX_ARGS, OVERLOADS, ~)
 BOOST_PP_REPEAT(SCRIPT_INTERFACE_MAX_ARGS, OVERLOADS, ~)
 #undef OVERLOADS
 
-#define ASSIGN_OR_TO_JS_VAL(z, i, data) AssignOrToJSVal(cx, argv.handleAt(i), a##i);
+#define ASSIGN_OR_TO_JS_VAL(z, i, data) AssignOrToJSVal(cx, argv[i], a##i);
 
 #define OVERLOADS(z, i, data) \
 template<typename R TYPENAME_T0_TAIL(z, i)> \
diff --git a/source/scriptinterface/ScriptInterface.h b/source/scriptinterface/ScriptInterface.h
index 9debed2609..3e843e7a70 100644
--- a/source/scriptinterface/ScriptInterface.h
+++ b/source/scriptinterface/ScriptInterface.h
@@ -501,7 +501,7 @@ bool ScriptInterface::CallFunctionVoid(JS::HandleValue val, const char* name, co
 	JS::RootedValue jsRet(cx);
 	JS::AutoValueVector argv(cx);
 	argv.resize(1);
-	AssignOrToJSVal(cx, argv.handleAt(0), a0);
+	AssignOrToJSVal(cx, argv[0], a0);
 	return CallFunction_(val, name, argv, &jsRet);
 }
 
@@ -513,8 +513,8 @@ bool ScriptInterface::CallFunctionVoid(JS::HandleValue val, const char* name, co
 	JS::RootedValue jsRet(cx);
 	JS::AutoValueVector argv(cx);
 	argv.resize(2);
-	AssignOrToJSVal(cx, argv.handleAt(0), a0);
-	AssignOrToJSVal(cx, argv.handleAt(1), a1);
+	AssignOrToJSVal(cx, argv[0], a0);
+	AssignOrToJSVal(cx, argv[1], a1);
 	return CallFunction_(val, name, argv, &jsRet);
 }
 
@@ -526,9 +526,9 @@ bool ScriptInterface::CallFunctionVoid(JS::HandleValue val, const char* name, co
 	JS::RootedValue jsRet(cx);
 	JS::AutoValueVector argv(cx);
 	argv.resize(3);
-	AssignOrToJSVal(cx, argv.handleAt(0), a0);
-	AssignOrToJSVal(cx, argv.handleAt(1), a1);
-	AssignOrToJSVal(cx, argv.handleAt(2), a2);
+	AssignOrToJSVal(cx, argv[0], a0);
+	AssignOrToJSVal(cx, argv[1], a1);
+	AssignOrToJSVal(cx, argv[2], a2);
 	return CallFunction_(val, name, argv, &jsRet);
 }