Fixes #312589

Original commit message from CVS:
Fixes #312589
2 files changed