fix the bugs.