change to set fields to null