KRACOEUS-7249:Fixed

Code changes to fix KRACOEUS-7249.