fixed some cases involving comments inside blocks