Fixed NFC bug