Close #58, close #60, close #63