Fix for code folding preserving issue.