Resolved subtype bug