repair some question