#4218 added the fields just before they're needed