Disconnect fix