Type transformation fix