More efficient upper bound wraparound