Proposed fix for the issue #18.