Fixed NFC functionality