[FOLD] more assert and fixing