fixup MathUtil