bug fixed, close #19