Proposed fix for issue #16