Fix some bug

Fix some bug