KRACOEUS-8136

- Fixed  KRACOEUS-8136