resolve some bug