Correct some bugs in the NFC-transmission logic