rewrite some mistake