some fix up