the rest of the kindof_typ pi fix.