Kracoeus 7581

- Fixed KRACOEUS-7581