fix bugs for comments