Issue #8. Better coverage.