some fixess