github issue #158