Fix for multiple parameters in function calls