Better solution for underflow recovery - now use the same method.