Fixed bug #77 for comments