Added more error tolerance.