fix and close #158