diff --git a/src/monocoque/devices/serial/arduino.c b/src/monocoque/devices/serial/arduino.c
index 39db451..1efc585 100644
--- a/src/monocoque/devices/serial/arduino.c
+++ b/src/monocoque/devices/serial/arduino.c
@@ -42,7 +42,7 @@ int arduino_update(SerialDevice* serialdevice, void* data, size_t size)
 //    return result;
 //}
 
-int arduino_init(SerialDevice* serialdevice, const char* portdev, int baud)
+int arduino_init(SerialDevice* serialdevice, const char* portdev)
 {
     slogi("initializing arduino serial device...");
     int error = 0;
@@ -59,7 +59,7 @@ int arduino_init(SerialDevice* serialdevice, const char* portdev, int baud)
     check(sp_open(serialdevice->port, SP_MODE_READ_WRITE));
 
     slogd("Setting port to %i 8N1, no flow control", serialdevice->baud);
-    check(sp_set_baudrate(serialdevice->port, baud));
+    check(sp_set_baudrate(serialdevice->port, serialdevice->baud));
     check(sp_set_bits(serialdevice->port, 8));
     check(sp_set_parity(serialdevice->port, SP_PARITY_NONE));
     check(sp_set_stopbits(serialdevice->port, 1));
diff --git a/src/monocoque/devices/serial/arduino.h b/src/monocoque/devices/serial/arduino.h
index 259ff55..a348988 100644
--- a/src/monocoque/devices/serial/arduino.h
+++ b/src/monocoque/devices/serial/arduino.h
@@ -6,7 +6,7 @@
 
 
 int arduino_update(SerialDevice* serialdevice, void* data, size_t size);
-int arduino_init(SerialDevice* serialdevice,  const char* portdev, int baud);
+int arduino_init(SerialDevice* serialdevice,  const char* portdev);
 int arduino_free(SerialDevice* serialdevice);
 int check(enum sp_return result);
 
diff --git a/src/monocoque/devices/serialdevice.c b/src/monocoque/devices/serialdevice.c
index 6cf3e13..d2aaa10 100644
--- a/src/monocoque/devices/serialdevice.c
+++ b/src/monocoque/devices/serialdevice.c
@@ -140,9 +140,7 @@ int serialdev_init(SerialDevice* serialdevice, DeviceSettings* ds)
     serialdevice->motorsposition = ds->serialdevsettings.motorsposition;
     serialdevice->baudrate = ds->serialdevsettings.baud;
 
-    serialdevice->baud = baud;
-
-    error = arduino_init(serialdevice, portdev);
+    error = arduino_init(serialdevice, ds->serialdevsettings.portdev);
     switch (serialdevice->type)
     {
     case SERIALDEV_WHEEL:
@@ -153,7 +151,7 @@ int serialdev_init(SerialDevice* serialdevice, DeviceSettings* ds)
         break;
 
     default:
-        error = arduino_init(serialdevice, ds->serialdevsettings.portdev, ds->serialdevsettings.baud);
+        error = arduino_init(serialdevice, ds->serialdevsettings.portdev );
     }