Fix bug caused by errandt comma