Arg count fix #2