Improved wraparound stability