Fixes bug 863591
Merge pull request #3210 from Snuffleupagus/bug863591

Fixes bug 863591