close #658