Fix and close #94