FIX: Notification counters were being updated incorrectly.