diff --git a/lib/esc.js b/lib/esc.js
index 55679a42c..66bcf1279 100644
--- a/lib/esc.js
+++ b/lib/esc.js
@@ -26,6 +26,8 @@ var Controllers = {
           pwmRange: this.pwmRange,
           frequency: 50, // Hz
         });
+
+        this.pin = state.expander.normalize(opts.pin);
       }
     },
     write: {
diff --git a/lib/expander.js b/lib/expander.js
index a97890497..e18610823 100644
--- a/lib/expander.js
+++ b/lib/expander.js
@@ -661,34 +661,17 @@ var Controllers = {
     },
     digitalWrite: {
       value: function(pin, value) {
-
-        // The Tessel Servo module is mislabeled 1 - 16 instead of 0 - 15
-        if (this.io.name === "Tessel 2") {
-          pin--;
-        }
-
         this.pwmWrite(pin, value ? 255 : 0);
       }
     },
     analogWrite: {
       value: function(pin, value) {
-
-        // The Tessel Servo module is mislabeled 1 - 16 instead of 0 - 15
-        if (this.io.name === "Tessel 2") {
-          pin--;
-        }
-
         this.pwmWrite(pin, value);
       }
     },
     servoWrite: {
       value: function(pin, value) {
 
-        // The Tessel Servo module is mislabeled 1 - 16 instead of 0 - 15
-        if (this.io.name === "Tessel 2") {
-          pin--;
-        }
-
         value = Board.constrain(value, 0, 180);
 
         var off = __.map(value, 0, 180, this.pwmRange[0] / 4, this.pwmRange[1] / 4);
@@ -703,11 +686,6 @@ var Controllers = {
     pwmWrite: {
       value: function(pin, value) {
 
-        // The Tessel Servo module is mislabeled 1 - 16 instead of 0 - 15
-        if (this.io.name === "Tessel 2") {
-          pin--;
-        }
-
         if (this.pins[pin] === undefined) {
           throw new RangeError("Invalid PCA9685 pin: " + pin);
         }
diff --git a/lib/led/led.js b/lib/led/led.js
index 1d353ee1b..9c74aefed 100644
--- a/lib/led/led.js
+++ b/lib/led/led.js
@@ -27,6 +27,8 @@ var Controllers = {
 
         this.pin = typeof opts.pin === "undefined" ? 0 : opts.pin;
 
+        this.pin = state.expander.normalize(opts.pin);
+
         state.mode = this.io.MODES.PWM;
       }
     },
diff --git a/lib/led/rgb.js b/lib/led/rgb.js
index 4f494ee41..87bd707cb 100644
--- a/lib/led/rgb.js
+++ b/lib/led/rgb.js
@@ -61,6 +61,8 @@ var Controllers = {
 
         this.pin = typeof opts.pin === "undefined" ? 0 : opts.pin;
 
+        this.pin = state.expander.normalize(opts.pin);
+
         state.mode = this.io.MODES.PWM;
       }
     },
diff --git a/lib/motor.js b/lib/motor.js
index 629f19d73..ab8cd379a 100644
--- a/lib/motor.js
+++ b/lib/motor.js
@@ -112,6 +112,8 @@ var Controllers = {
           pwmRange: this.pwmRange,
           frequency: 50, // Hz
         });
+
+        this.pin = state.expander.normalize(opts.pin);
       }
     }
   },
diff --git a/lib/servo.js b/lib/servo.js
index 5b8ba4911..02b4ee7dd 100644
--- a/lib/servo.js
+++ b/lib/servo.js
@@ -27,6 +27,8 @@ var Controllers = {
           pwmRange: this.pwmRange,
           frequency: 50, // Hz
         });
+
+        this.pin = state.expander.normalize(opts.pin);
       }
     },
     servoWrite: {