validity range: fixing recalculation error.

clean-up still required.