Fixes issue 120.
4 files changed