Re #10674 This should fix it