Resolve Issue #118