some fix 2