Resolve Issue #26