fix and close #27