Fix to #8816