Re #7924 Trying to fix Jean's mess