Fix not disconnecting