diff --git a/pom.xml b/pom.xml
index a32a08bcc875328076a83b6e2db0ddd9b8f466dd..45c9c7d28e34e0f851cfc65795bf70631a697551 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
    </parent>
    <groupId>fr.soleil.lib</groupId>
    <artifactId>Electrometers-${aol}-${library}-${mode}</artifactId>
-   <version>2.5.4</version>
+   <version>2.5.5</version>
    <packaging>nar</packaging>
    <name>Electrometers library</name>
    <description>Electrometers library</description>
diff --git a/src/KeithleySCPIProtocol.cpp b/src/KeithleySCPIProtocol.cpp
index 147c72079ec0d72a36d2c83c91980027c9e7e1df..5dd54f23fe698a2c6dd164b6a7471ad1f1302b4e 100644
--- a/src/KeithleySCPIProtocol.cpp
+++ b/src/KeithleySCPIProtocol.cpp
@@ -939,7 +939,7 @@ void KeithleySCPIProtocol::set_averagecount (std::string nbAverageCount)
 // ============================================================================
 // KeithleySCPIProtocol::set_averagecount
 // ============================================================================
-void KeithleySCPIProtocol::set_averagecount_K6517 (std::string cmd_to_send) 
+void KeithleySCPIProtocol::set_averagecount_K6517 (std::string nbAverageCount) 
 {
 	if( !this->_communication_link )
 	{
@@ -956,7 +956,7 @@ void KeithleySCPIProtocol::set_averagecount_K6517 (std::string cmd_to_send)
 	tmpMode.erase( tmpMode.find("\n") );
 	
 	//- send command
-	std::string cmd_to_send = tmpMode + ":AVER:COUN " + cmd_to_send ;
+	std::string cmd_to_send = tmpMode + ":AVER:COUN " + nbAverageCount ;
 	_communication_link->write(cmd_to_send);
 }
 
diff --git a/src/TangoSerialLink.cpp b/src/TangoSerialLink.cpp
index 7cfc10490b93596e0c158ee8f395317004375ae6..70a64efdc2c6d0f477f3fcf8bdd45151cf9b3455 100644
--- a/src/TangoSerialLink.cpp
+++ b/src/TangoSerialLink.cpp
@@ -117,7 +117,7 @@ void TangoSerialLink::create_serial_proxy (void)  throw (Tango::DevFailed)
 			this->_serial_proxy = 0;
 		}
 		_is_serial_proxy_created = false;
-		description = "Unable to write command : " + command_to_send + "\nmemory allocation failed.";
+		description = "Unable to create proxy on : " + _communication_Device_name + "\nmemory allocation failed.";
 		Tango::Except::throw_exception (
 										(const char*)"ALLOCATION_ERROR",
 										description.c_str(),