Fix bugs for comments