Do not assign null to old fields on fight