client side termination fix