Hopefully the last bug fix for the math.