fix comment handling