Fix nested notification support