solve some bug