close #94: fixed