Close #69, close #78