KRACOEUS-7850

-Fix for the KRACOEUS-7850