#6069 fix remarks