adjust notification handling to work again