Fixed parsing of comma separated functions