fix some fix