Different take on Issue #16.