KRACOEUS-8010: fixing more bugs
KRACOEUS-8010: fixing another copy bug
KRACOEUS-8010: fixing another copy bug
Merge pull request #1148 from leoherbie/KRACOEUS-8010_5

KRACOEUS-8010: fixing more bugs