[FOLD] add 2 more cases
[FOLD] fixes