fixup for cmplus