Fixed notification issue