Issue #118, #117, #104