diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp
index c7f45bd667..cb729d21ff 100644
--- a/Source/Core/Core/Src/HW/EXI_Channel.cpp
+++ b/Source/Core/Core/Src/HW/EXI_Channel.cpp
@@ -42,7 +42,7 @@ CEXIChannel::CEXIChannel(u32 ChannelId) :
 		m_Status.CHIP_SELECT = 1;
 
 	for (int i = 0; i < NUM_DEVICES; i++)
-		m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE, i);
+		m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE, m_ChannelId);
 }
 
 CEXIChannel::~CEXIChannel()
@@ -71,7 +71,7 @@ void CEXIChannel::AddDevice(const TEXIDevices device_type, const int device_num)
 	}
 
 	// create the new one
-	m_pDevices[device_num] = EXIDevice_Create(device_type, device_num);
+	m_pDevices[device_num] = EXIDevice_Create(device_type, m_ChannelId);
 
 	// This means "device presence changed", software has to check
 	// m_Status.EXT to see if it is now present or not
diff --git a/Source/Core/Core/Src/HW/EXI_Device.cpp b/Source/Core/Core/Src/HW/EXI_Device.cpp
index 5eb3aa1631..aa24148f59 100644
--- a/Source/Core/Core/Src/HW/EXI_Device.cpp
+++ b/Source/Core/Core/Src/HW/EXI_Device.cpp
@@ -102,7 +102,7 @@ public:
 
 
 // F A C T O R Y 
-IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int device_num)
+IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int channel_num)
 {
 	switch (device_type)
 	{
@@ -111,7 +111,7 @@ IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int device_num)
 		break;
 
 	case EXIDEVICE_MEMORYCARD:
-		return new CEXIMemoryCard(device_num);
+		return new CEXIMemoryCard(channel_num);
 		break;
 
 	case EXIDEVICE_MASKROM:
@@ -123,7 +123,7 @@ IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int device_num)
 		break;
 
 	case EXIDEVICE_MIC:
-		return new CEXIMic(device_num);
+		return new CEXIMic(channel_num);
 		break;
 
 	case EXIDEVICE_ETH:
diff --git a/Source/Core/Core/Src/HW/EXI_Device.h b/Source/Core/Core/Src/HW/EXI_Device.h
index d8f3706885..15cd79d77c 100644
--- a/Source/Core/Core/Src/HW/EXI_Device.h
+++ b/Source/Core/Core/Src/HW/EXI_Device.h
@@ -63,6 +63,6 @@ enum TEXIDevices
 	EXIDEVICE_NONE = (u8)-1
 };
 
-extern IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int device_num);
+extern IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int channel_num);
 
 #endif