Added workaround for variables in function calls.