diff --git a/include/la/avdecc/avdecc.i b/include/la/avdecc/avdecc.i
index ff7e1c4b..47ea5266 100644
--- a/include/la/avdecc/avdecc.i
+++ b/include/la/avdecc/avdecc.i
@@ -35,10 +35,10 @@
 	#include <la/avdecc/internals/endStation.hpp>
 %}
 
-// Optimize code generation be enabling RVO
+// Optimize code generation by enabling RVO
 %typemap(out, optimal="1") SWIGTYPE
 %{
-	$result = new $1_ltype((const $1_ltype &)$1);
+	$result = new $1_ltype($1);
 %}
 
 #define LA_AVDECC_API
diff --git a/include/la/avdecc/controller/avdeccController.i b/include/la/avdecc/controller/avdeccController.i
index fa961172..1835ec46 100644
--- a/include/la/avdecc/controller/avdeccController.i
+++ b/include/la/avdecc/controller/avdeccController.i
@@ -22,10 +22,10 @@
 	#include <la/avdecc/controller/avdeccController.hpp>
 %}
 
-// Optimize code generation be enabling RVO
+// Optimize code generation by enabling RVO
 %typemap(out, optimal="1") SWIGTYPE
 %{
-	$result = new $1_ltype((const $1_ltype &)$1);
+	$result = new $1_ltype($1);
 %}
 
 #define LA_AVDECC_CONTROLLER_API