Fix and close #22