Should be almost fixed.