fix some problem