Fix for issue 587.
3 files changed