Fix to NFC problems