Proposed fix issue #107.