TYPE fix