Updated Fix for #22434