some fixup