#11893 bug fixex