some fix 1