close #217, close #214