Fix field counting when the fields are stored within a single file