Issue #22: