some fix2