fixed issue 126 close #126