fix and close #15