Fix for issue 272.
3 files changed