Proposed fix for issue #5.