Fix NotificationCenter