Fix some bugs about number