fixed and closed #118