fix the bugs