2702 - fix 2701

Must write tests. Must run tests.