Fix major performance problem for some users