Fix subtypes