Fix duplicated notification message issue