Minor error tolerance improvement