better deconnection support