Comma fix
XXX: additional hacking.