Fixed TypeO