Moved up the call to the OnDisconnect event.