Handle residual underflow/overflow correctly