KRACOEUS-7597:fixing data override
Merge pull request #890 from jwillia/KRACOEUS_7597_2

KRACOEUS-7597:fixing data override