issue #95 &#99