Fixed folding glitches 1