Fixed comment parsing