fix the bugs_3