fix subscriber termination logic