Fix for NFC