fixed issue 143