Fix for #7151