some fix-2