Fix nested event subscriptions properly