Correct rounding fix; TODO: this properly