Fix issue 10800