--- a/src/luan/LuanJavaFunction.java	Tue Jan 22 21:56:05 2013 +0000
+++ b/src/luan/LuanJavaFunction.java	Wed Jan 23 02:24:41 2013 +0000
@@ -49,8 +49,9 @@
 	}
 
 	@Override public Object[] call(LuanState luan,Object[] args) throws LuanException {
+		args = fixArgs(luan,args);
 		try {
-			return rawCall(luan,args);
+			return doCall(luan,args);
 		} catch(IllegalArgumentException e) {
 			checkArgs(luan,args);
 			throw e;
@@ -59,6 +60,10 @@
 
 	public Object[] rawCall(LuanState luan,Object[] args) throws LuanException {
 		args = fixArgs(luan,args);
+		return doCall(luan,args);
+	}
+
+	private Object[] doCall(LuanState luan,Object[] args) throws LuanException {
 		Object rtn;
 		try {
 			rtn = method.invoke(obj,args);
@@ -81,11 +86,6 @@
 
 	private void checkArgs(LuanState luan,Object[] args) throws LuanException {
 		Class<?>[] a = getParameterTypes();
-		if( takesLuaState ) {
-			Class<?>[] t = new Class<?>[a.length-1];
-			System.arraycopy(a,1,t,0,t.length);
-			a = t;
-		}
 		for( int i=0; i<a.length; i++ ) {
 			Class<?> paramType = a[i];
 			Object arg = args[i];