Fixed rounding problems