Fix FIELD_COUNT