Re #10532 all working, all fixed.