bug fix issue #95