Fix issue #116