close #522