KRACOEUS-8138

- Fixed  KRACOEUS-8138