Fix commas not being added before underscores