Fix for issue 646.
8 files changed