Fix issue #160