Fix more bug

Fix bug