fix some bug too