120414 Fix some bug