KRACOEUS-8409

- Fixed KRACOEUS-8409