Improved error tolerance.