solve some bug successfully :heart_eyes: