resolve some issues