Fix for commas in parameter names

Change-Id: I1e986ae9eaa6093c99857a2e73b3c5fae9f96018