Proposed fix for issue #6