adapt to firm xfree() removal