close #657