Fixed comment handling