diff --git a/wiringPi/odroidc1.c b/wiringPi/odroidc1.c
index 874067f..db1725d 100755
--- a/wiringPi/odroidc1.c
+++ b/wiringPi/odroidc1.c
@@ -286,10 +286,10 @@ static void _pinMode (int pin, int mode)
 		*(gpio + fsel) = (*(gpio + fsel) & ~(1 << shift));
 	break;
 	case	SOFT_PWM_OUTPUT:
-		softPwmCreate (pin, 0, 100);
+		softPwmCreate (origPin, 0, 100);
 	break;
 	case	SOFT_TONE_OUTPUT:
-		softToneCreate (pin);
+		softToneCreate (origPin);
 	break;
 	default:
 		msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
diff --git a/wiringPi/odroidc2.c b/wiringPi/odroidc2.c
index 7cf6da6..2c39daa 100755
--- a/wiringPi/odroidc2.c
+++ b/wiringPi/odroidc2.c
@@ -340,10 +340,10 @@ static void _pinMode (int pin, int mode)
 		*(gpio + fsel) = (*(gpio + fsel) & ~(1 << shift));
 	break;
 	case	SOFT_PWM_OUTPUT:
-		softPwmCreate (pin, 0, 100);
+		softPwmCreate (origPin, 0, 100);
 	break;
 	case	SOFT_TONE_OUTPUT:
-		softToneCreate (pin);
+		softToneCreate (origPin);
 	break;
 	default:
 		msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
diff --git a/wiringPi/odroidn1.c b/wiringPi/odroidn1.c
index 2bd5cc1..b8d30a7 100755
--- a/wiringPi/odroidn1.c
+++ b/wiringPi/odroidn1.c
@@ -291,10 +291,10 @@ static void _pinMode (int pin, int mode)
 		*(gpio[bank] + (N1_GPIO_CON_OFFSET >> 2)) |=  (1 << gpioToShiftReg(pin));
 		break;
 	case SOFT_PWM_OUTPUT:
-		softPwmCreate (pin, 0, 100);
+		softPwmCreate (origPin, 0, 100);
 		break;
 	case SOFT_TONE_OUTPUT:
-		softToneCreate (pin);
+		softToneCreate (origPin);
 		break;
 	default:
 		msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
diff --git a/wiringPi/odroidn2.c b/wiringPi/odroidn2.c
index 413491f..0988004 100755
--- a/wiringPi/odroidn2.c
+++ b/wiringPi/odroidn2.c
@@ -358,10 +358,10 @@ static void _pinMode (int pin, int mode)
 		*(gpio + fsel) = (*(gpio + fsel) & ~(1 << shift));
 	break;
 	case	SOFT_PWM_OUTPUT:
-		softPwmCreate (pin, 0, 100);
+		softPwmCreate (origPin, 0, 100);
 	break;
 	case	SOFT_TONE_OUTPUT:
-		softToneCreate (pin);
+		softToneCreate (origPin);
 	break;
 	default:
 		msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
diff --git a/wiringPi/odroidxu3.c b/wiringPi/odroidxu3.c
index 139ea45..236fcbe 100755
--- a/wiringPi/odroidxu3.c
+++ b/wiringPi/odroidxu3.c
@@ -391,10 +391,10 @@ static void _pinMode (int pin, int mode)
 		}
 	break;
 	case	SOFT_PWM_OUTPUT:
-		softPwmCreate (pin, 0, 100);
+		softPwmCreate (origPin, 0, 100);
 	break;
 	case	SOFT_TONE_OUTPUT:
-		softToneCreate (pin);
+		softToneCreate (origPin);
 	break;
 	default:
 		msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);