close #229, close #230