Tweaking last patch to ensure we don't overwrite record data