Fix for folding