First attempt at Issue #271