fix #1103-like issue for comments