Close #38, close #41