Would close #39 if necessary