Fix issue #95