Issue #2.5