Fix issue #92