solve some bug.