KRACOEUS-8507

- Fixed KRACOEUS-8507