fixup Base