Attempting to fix the "100 new notifications" bug