Revise the error computation (really tricky)