fix  some bug