KRACOEUS-7120: fixing bug discovered during code review