Fix #2533073