Fix NFC problem for d2vzw