Issue #2207773 by ericrdb: Improve Performance