Proposed fix for issue #8

For issue #8