Fix the bugs caused by not testing...