Issue #2179791 by ericrdb: Improve Performance