Possible fix for #10206