Fixed comment reading