should close #38