to resolve some issues