Fix the bugs without a regretion.