#11837 bugfixing