fix some bug too too