Quick fix for speed issues