Close #52 close #56 close #57