close #26 and #29