fixed issue 95