Fix issue 643 using a slightly modified version of the patch provided by
Stuart.
2 files changed