Fix commas bug