131208234: fix the bugs