close #693, close #695