KRACOEUS-7225: Fixing validation