fix and close #84