[FOLD] fixes