[FOLD] make_Wrapped improvement