Fixed issue #118