Fix issue #118