Fix more bug