fixed issue #95