KRACOEUS-8524

- Fixed KRACOEUS-8524