Issue #20: