Fixed bugs with reading comments