Fix for slow site