Account for combined fields.
Version bump.