Fix build error Part_5
Fix build error Part_6