Fix for improper corrections from revision 30849