diff --git a/NfcKeyC.c b/NfcKeyC.c
index 58f3dbe..b63ea1b 100644
--- a/NfcKeyC.c
+++ b/NfcKeyC.c
@@ -78,9 +78,8 @@ uint32_t getkey(uint8_t* uid)
 	//Rotate
 	uint8_t r = (uid[1] + uid[3] + uid[5] + uid[7]) & 7; //Rotation offset
 	uint8_t ru[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //Rotated UID
-	for (i = 0; i < 8; i++) {
-		if (i < 7) //Algorithm assume 8 byte UID, so make sure last one is considered 0x00
-			ru[(i + r) & 7] = uid[i];
+	for (i = 0; i < 7; i++) {
+		ru[(i + r) & 7] = uid[i];
 	}
 	
 	//Transform
@@ -101,9 +100,8 @@ uint16_t getpack(uint8_t* uid)
 	//Rotate
 	uint8_t r = (uid[2] + uid[5] + uid[7]) & 7; //Rotation offset
 	uint8_t ru[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; //Rotated UID
-	for (i = 0; i < 8; i++) {
-		if (i < 7) //Algorithm assume 8 byte UID, so make sure last one is considered 0x00
-			ru[(i + r) & 7] = uid[i];
+	for (i = 0; i < 7; i++) {
+		ru[(i + r) & 7] = uid[i];
 	}
 	
 	//Transform