- Add fix some bug