issue #117, issue #118