Proposed fix issue #122.