[fix] some bug fix