diff --git a/getsysex.sh b/getsysex.sh
index 0111b61..d1b4aa9 100755
--- a/getsysex.sh
+++ b/getsysex.sh
@@ -7,37 +7,37 @@ mkdir -p sysex/voice/
 
 DIR="https://yamahablackboxes.com/patches/dx7/factory"
 
-wget -c "${DIR}"/rom1a.syx -O sysex/voice/000001_rom1a.syx
-wget -c "${DIR}"/rom1b.syx -O sysex/voice/000002_rom1b.syx
-wget -c "${DIR}"/rom2a.syx -O sysex/voice/000003_rom2a.syx
-wget -c "${DIR}"/rom2b.syx -O sysex/voice/000004_rom2b.syx
-wget -c "${DIR}"/rom3a.syx -O sysex/voice/000005_rom3a.syx
-wget -c "${DIR}"/rom3b.syx -O sysex/voice/000006_rom3b.syx
-wget -c "${DIR}"/rom4a.syx -O sysex/voice/000007_rom4a.syx
-wget -c "${DIR}"/rom4b.syx -O sysex/voice/000008_rom4b.syx
+wget -c "${DIR}"/rom1a.syx -O sysex/voice/000000_rom1a.syx
+wget -c "${DIR}"/rom1b.syx -O sysex/voice/000001_rom1b.syx
+wget -c "${DIR}"/rom2a.syx -O sysex/voice/000002_rom2a.syx
+wget -c "${DIR}"/rom2b.syx -O sysex/voice/000003_rom2b.syx
+wget -c "${DIR}"/rom3a.syx -O sysex/voice/000004_rom3a.syx
+wget -c "${DIR}"/rom3b.syx -O sysex/voice/000005_rom3b.syx
+wget -c "${DIR}"/rom4a.syx -O sysex/voice/000006_rom4a.syx
+wget -c "${DIR}"/rom4b.syx -O sysex/voice/000007_rom4b.syx
 
 DIR="https://yamahablackboxes.com/patches/dx7/vrc"
 
-wget -c "${DIR}"/vrc101b.syx -O sysex/voice/000009_vrc101b.syx
-wget -c "${DIR}"/vrc102a.syx -O sysex/voice/0000010_vrc102a.syx
-wget -c "${DIR}"/vrc102b.syx -O sysex/voice/0000011_vrc102b.syx
-wget -c "${DIR}"/vrc103a.syx -O sysex/voice/0000012_vrc103a.syx
-wget -c "${DIR}"/vrc103b.syx -O sysex/voice/0000013_vrc103b.syx
-wget -c "${DIR}"/vrc104a.syx -O sysex/voice/0000014_vrc104a.syx
-wget -c "${DIR}"/vrc104b.syx -O sysex/voice/0000015_vrc104b.syx
-wget -c "${DIR}"/vrc105a.syx -O sysex/voice/0000016_vrc105a.syx
-wget -c "${DIR}"/vrc105b.syx -O sysex/voice/0000017_vrc105b.syx
-wget -c "${DIR}"/vrc106a.syx -O sysex/voice/0000018_vrc106a.syx
-wget -c "${DIR}"/vrc106b.syx -O sysex/voice/0000019_vrc106b.syx
-wget -c "${DIR}"/vrc107a.syx -O sysex/voice/0000020_vrc107a.syx
-wget -c "${DIR}"/vrc107b.syx -O sysex/voice/0000021_vrc107b.syx
-wget -c "${DIR}"/vrc108a.syx -O sysex/voice/0000022_vrc108a.syx
-wget -c "${DIR}"/vrc108b.syx -O sysex/voice/0000023_vrc108b.syx
-wget -c "${DIR}"/vrc109a.syx -O sysex/voice/0000024_vrc109a.syx
-wget -c "${DIR}"/vrc109b.syx -O sysex/voice/0000025_vrc109b.syx
-wget -c "${DIR}"/vrc110a.syx -O sysex/voice/0000026_vrc110a.syx
-wget -c "${DIR}"/vrc110b.syx -O sysex/voice/0000027_vrc110b.syx
-wget -c "${DIR}"/vrc111a.syx -O sysex/voice/0000028_vrc111a.syx
-wget -c "${DIR}"/vrc111b.syx -O sysex/voice/0000029_vrc111b.syx
-wget -c "${DIR}"/vrc112a.syx -O sysex/voice/0000030_vrc112a.syx
-wget -c "${DIR}"/vrc112b.syx -O sysex/voice/0000031_vrc112b.syx
+wget -c "${DIR}"/vrc101b.syx -O sysex/voice/000008_vrc101b.syx
+wget -c "${DIR}"/vrc102a.syx -O sysex/voice/0000009_vrc102a.syx
+wget -c "${DIR}"/vrc102b.syx -O sysex/voice/0000010_vrc102b.syx
+wget -c "${DIR}"/vrc103a.syx -O sysex/voice/0000011_vrc103a.syx
+wget -c "${DIR}"/vrc103b.syx -O sysex/voice/0000012_vrc103b.syx
+wget -c "${DIR}"/vrc104a.syx -O sysex/voice/0000013_vrc104a.syx
+wget -c "${DIR}"/vrc104b.syx -O sysex/voice/0000014_vrc104b.syx
+wget -c "${DIR}"/vrc105a.syx -O sysex/voice/0000015_vrc105a.syx
+wget -c "${DIR}"/vrc105b.syx -O sysex/voice/0000016_vrc105b.syx
+wget -c "${DIR}"/vrc106a.syx -O sysex/voice/0000017_vrc106a.syx
+wget -c "${DIR}"/vrc106b.syx -O sysex/voice/0000018_vrc106b.syx
+wget -c "${DIR}"/vrc107a.syx -O sysex/voice/0000019_vrc107a.syx
+wget -c "${DIR}"/vrc107b.syx -O sysex/voice/0000020_vrc107b.syx
+wget -c "${DIR}"/vrc108a.syx -O sysex/voice/0000021_vrc108a.syx
+wget -c "${DIR}"/vrc108b.syx -O sysex/voice/0000022_vrc108b.syx
+wget -c "${DIR}"/vrc109a.syx -O sysex/voice/0000023_vrc109a.syx
+wget -c "${DIR}"/vrc109b.syx -O sysex/voice/0000024_vrc109b.syx
+wget -c "${DIR}"/vrc110a.syx -O sysex/voice/0000025_vrc110a.syx
+wget -c "${DIR}"/vrc110b.syx -O sysex/voice/0000026_vrc110b.syx
+wget -c "${DIR}"/vrc111a.syx -O sysex/voice/0000027_vrc111a.syx
+wget -c "${DIR}"/vrc111b.syx -O sysex/voice/0000028_vrc111b.syx
+wget -c "${DIR}"/vrc112a.syx -O sysex/voice/0000029_vrc112a.syx
+wget -c "${DIR}"/vrc112b.syx -O sysex/voice/0000030_vrc112b.syx
diff --git a/src/minidexed.cpp b/src/minidexed.cpp
index 25e5372..9ac0984 100644
--- a/src/minidexed.cpp
+++ b/src/minidexed.cpp
@@ -159,13 +159,13 @@ void CMiniDexed::MIDIPacketHandler (unsigned nCable, u8 *pPacket, unsigned nLeng
 	{
 		if (pPacket[1] == MIDI_CC_BANK_SELECT_LSB)
 		{
-			if (pPacket[2] < 1 || pPacket[2] > 128)
+			if (pPacket[2] > 127)
 			{
 				return;
 			}
 
 			printf ("Select voice bank %u\n", (unsigned) pPacket[2]);
-			s_pThis->m_SysExFileLoader.SelectVoiceBank (pPacket[2]-1);
+			s_pThis->m_SysExFileLoader.SelectVoiceBank (pPacket[2]);
 		}
 
 		return;
@@ -173,12 +173,12 @@ void CMiniDexed::MIDIPacketHandler (unsigned nCable, u8 *pPacket, unsigned nLeng
 
 	if (pPacket[0] == MIDI_PROGRAM_CHANGE)
 	{
-		if(pPacket[1] < 1 || pPacket[1] > 32) {
+		if(pPacket[1] > 31) {
 			return;
 		}
 		printf ("Loading voice %u\n", (unsigned) pPacket[1]);
 		uint8_t Buffer[156];
-		s_pThis->m_SysExFileLoader.GetVoice (pPacket[1]-1, Buffer);
+		s_pThis->m_SysExFileLoader.GetVoice (pPacket[1], Buffer);
 		s_pThis->loadVoiceParameters(Buffer);
 		char buf_name[11];
 		memset(buf_name, 0, 11); // Initialize with 0x00 chars
@@ -353,4 +353,4 @@ unsigned CMiniDexedHDMI::GetChunk(u32 *pBuffer, unsigned nChunkSize)
 void CMiniDexed::LCDWrite (const char *pString)
 {
 	m_LCD.Write (pString, strlen (pString));
-}
\ No newline at end of file
+}
diff --git a/src/sysexfileloader.cpp b/src/sysexfileloader.cpp
index 062a720..ed1be99 100644
--- a/src/sysexfileloader.cpp
+++ b/src/sysexfileloader.cpp
@@ -73,8 +73,7 @@ void CSysExFileLoader::Load (void)
 			continue;
 		}
 
-		if (   nBank < 1
-		    || nBank > MaxVoiceBankID+1)
+		if (nBank > MaxVoiceBankID)
 		{
 			LOGWARN ("Bank #%u is not supported", nBank);