Issue #3 needs a test
Issue #3 needs a test