small bugix
todo: NFC added