Fix bugs in adding comment