Fixed bugs in CommentsRefactoring