fix issue #95