diff --git a/source/input.cpp b/source/input.cpp
index 0462877..5aa93d4 100644
--- a/source/input.cpp
+++ b/source/input.cpp
@@ -906,7 +906,7 @@ static u32 DecodeJoy(unsigned short pad)
 	}
 	else if(wpad_exp_type == WPAD_EXP_CLASSIC)
 	{ // classic controller
-		if (wp->exp.classic.type == 2) {
+		if (isWUPC) {
 			for (u32 i = 0; i < MAXJP; ++i)
 			{
 				if (wpad_btns_h & btnmap[CTRLR_WUPC][i] )