Fix bug

Fix some bug