Fixed folding init a little.