close #154, close #197