fixed issue #118