Issue #21: