Fix issue when equation expression contains ','