Bug fix #8705