Continue fixing, but still nroken