This fixes #8309.  It will now correct errors.