Bug fix for +comment.