fix and close #38