Client disconnect fix