FormFolding fixed