final fix issue #118