fix some problem

fix some problem