KFSCNTRB-1681 fix per code review