Fixed bug related to comments