Fix issue #104