Still not fixed, but progress I think.