some fixrs