Critical fix which made websites VERY slow