Bugfix unterminated Loop while deactivating and activating a Subscriber
Refactoring