Bug fix
Some update