Fixing #9192