Proposed fix for issue #129