Fix for site slowness