Fix handling subscription removals