Fix mantis issue #8826