Fix issues with enterBlock
for comment parsing
#1213
Merged
enterBlock
for comment parsing
#1213