restore comments (fix #19)