fixed issue 96