Fix for multiple argument values