Fixed NFC stuff