resolve some mistake