Working through issue #1713