KRACOEUS-7597:fixing data override

Not a huge fan of this short term form level state, but I'm not seeing a great alternative either.