Still not quite fixed, but for the most part it is.