close #76, close #84