Patch from Galen Charlton: This resolves a performance issue found by EG Indiana...