some fixs