#11837 bug fixing