some bug fixe