New fix for the 'field never assigned to' problem.