close #42, #46