Fix active client termination