KRACOEUS-7120: fixing code from code review