Fix overwritten data