Notification count fix...again