Fix notification issue