Still fixing rounding errors