fix some error
need debug