Fix issue #158