Type resolver fix