Fix and close #32