repair some mistake