diff --git a/test/bytecode_3.5_run/04_call_function.pyc b/test/bytecode_3.5_run/04_call_function.pyc
index 99d98c11..25f663e6 100644
Binary files a/test/bytecode_3.5_run/04_call_function.pyc and b/test/bytecode_3.5_run/04_call_function.pyc differ
diff --git a/test/simple_source/bug35/04_call_function.py b/test/simple_source/bug35/04_call_function.py
index a5900f6a..9f5b60d5 100644
--- a/test/simple_source/bug35/04_call_function.py
+++ b/test/simple_source/bug35/04_call_function.py
@@ -58,3 +58,8 @@ def __call__(self, *args, **kwds):
 # From 3.6.4 shutil
 def unpack_archive(func, filename, dict, format_info, extract_dir=None):
     func(filename, extract_dir, **dict(format_info[2]))
+
+# From 3.5.5 test_xrdrlib.py
+import xdrlib
+def assertRaisesConversion(self, *args):
+   self.assertRaises(xdrlib.ConversionError, *args)
diff --git a/uncompyle6/semantics/customize.py b/uncompyle6/semantics/customize.py
index 88d431e2..d26b20bf 100644
--- a/uncompyle6/semantics/customize.py
+++ b/uncompyle6/semantics/customize.py
@@ -363,9 +363,9 @@ def customize_for_version(self, is_pypy, version):
                                 self.template_engine(template, args_node)
                             else:
                                 if len(node) - nargs > 3:
-                                    template = ('*%c, %C)', 1, (nargs+kwargs+1, -1, ', '))
+                                    template = ('*%c, %C)', nargs+1, (nargs+kwargs+1, -1, ', '))
                                 else:
-                                    template = ('*%c)', 1)
+                                    template = ('*%c)', nargs+1)
                                 self.template_engine(template, node)
                             self.prune()