[finishes #84643252] Fixing notification count