Fixed issue w/ premature resetting in complex scenarios
reverse accidental de-finalization of all fields...