Bugfixing #9596