Fix for issue 450.
4 files changed