Attempt to fix folding issue