Proposed fix of #7.