Fix Slow Loading Issue