fix and close #159