diff --git a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32600/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32600/pwmout_api.c
index 1a412248de..39eeb75fe9 100644
--- a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32600/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32600/pwmout_api.c
@@ -77,9 +77,9 @@ void pwmout_init(pwmout_t* obj, PinName pin)
                     } 
 
                     // If all instances are in use, overwrite the last 
-                    pwm = PinMap_PWM[++i];
+                    pwm = PinMap_PWM[i++];
                     if(pwm.pin != pin) {
-                        pwm = PinMap_PWM[--i];
+                        pwm = PinMap_PWM[(i-1)];
                         i = -1; 
                         break;
                     }
diff --git a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/pwmout_api.c b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/pwmout_api.c
index 1a412248de..39eeb75fe9 100644
--- a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/pwmout_api.c
+++ b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/pwmout_api.c
@@ -77,9 +77,9 @@ void pwmout_init(pwmout_t* obj, PinName pin)
                     } 
 
                     // If all instances are in use, overwrite the last 
-                    pwm = PinMap_PWM[++i];
+                    pwm = PinMap_PWM[i++];
                     if(pwm.pin != pin) {
-                        pwm = PinMap_PWM[--i];
+                        pwm = PinMap_PWM[(i-1)];
                         i = -1; 
                         break;
                     }