Issues #12 and Issue #6