fixed a bugs on