support notifications correctly