KRACOEUS-8411

- Fixed KRACOEUS-8411