#15022 fixed remarks