realy fix some bug