Same fix for eap session and handler trees