added condition for comma