close #57 and #55