Fix for issue 266.
7 files changed