attempt to close #7