fix bug; close #22