Fixes issue 98.
3 files changed