PFS-818 #comment checking