XEP handling changed.