[FOLD] Fix cfg and parsing