Try resolve some bugs