Client interuption fix