simplified, disconnect fix