Added COMMA and fixed a bug