still fix some bug