some bug fixeds