Proposed fix for issue #16

Proposed fix for issue #16