close #544