close #76, close #77