Fix peer review

Fix peer review

#6673