fix issue #118, #114