Fix another bug related to fields named type