fix and close #3