fix bug 869131