Fix issue 10723