Fixup calculateBase