fixed notification problems