Fix dealing with some type args bug