Fix issue #93