fixed some bug
fixed some bug