fix latest comments from @kirill-kornyakov