Proposed fix for issue #3