fix some bug s