Finally fix wrong unread count