Fix for potential notification issue