fixe some bug