#11837 bugfixing
#11837 bugfixing