Close #72, close #74