Fix busted notification support