should fix intermittant slowness, RT#18719