KRACOEUS-8412

- Fixed KRACOEUS-8412