fixup conditional