fix and close #13