fixed issue 83