Improving Issue #26