Fix for issue 509.
3 files changed