diff --git a/armsrc/Makefile b/armsrc/Makefile
index dea5d06c..c763c559 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -10,7 +10,7 @@ APP_INCLUDES = apps.h
 
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation
-APP_CFLAGS	= -DWITH_ISO14443a_StandAlone -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF -DWITH_HITAG  -DWITH_CRC -DON_DEVICE -DWITH_HFSNOOP \
+APP_CFLAGS	= -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF -DWITH_HITAG  -DWITH_CRC -DON_DEVICE -DWITH_HFSNOOP \
 				-fno-strict-aliasing -ffunction-sections -fdata-sections
 #-DWITH_LCD
 
@@ -118,4 +118,3 @@ help:
 	@echo Possible targets:
 	@echo +	all    - Build the full image $(OBJDIR)/fullimage.s19
 	@echo +	clean  - Clean $(OBJDIR)
-
diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index 671ce03d..c7170c2f 100644
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -68,7 +68,7 @@ function checkBlock(blockNo, keys, keyType)
 								data = data}
 		local status = checkCommand(command)
 		if status then return status, blockNo end
-		start = start+n+1
+		start = start+n --fixed base on pwpiwi's reccomendation
 		remaining = remaining - n
 	end
 	return nil