- Fix some bug