some bug fix #118