after fix some bug