Working to issue #2892