fix and close #35