fixed issue 98