Fixed the retype check