Fix and close #30