fix some  bug