Merge "Fix number of parameters passed on recursive function call"