Finally fixed the comment boxes issue