repair some issue