Take author's comments into account