diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
index ad83aac..dccbfb1 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
@@ -6609,16 +6609,16 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 			director.setOperationExecutionBuilder(opEx);
 			director.constructOperationExecution();
 
-			ArrayList<OperationExecution> invocation = director
+			ArrayList<OperationExecution> invocations = director
 					.getListOperationExecution();
 
-			if (invocation == null) {
+			if (invocations == null) {
 				throw new TDGWTServiceException(
 						"Error in invocation: Operation not supported");
 			}
 
-			logger.debug("OperationInvocation: \n" + invocation.toString());
-			Task trTask = service.executeBatch(invocation, tabularResourceId);
+			logger.debug("OperationInvocation: \n" + invocations.toString());
+			Task trTask = service.executeBatch(invocations, tabularResourceId);
 
 			logger.debug("Start Task on service: TaskId " + trTask.getId());
 
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java
index 795531c..1236da5 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java
@@ -43,9 +43,8 @@ public class OpExecution4EditRow extends OpExecutionBuilder {
 		logger.debug(editRowSession.toString());
 		
 			
-		OperationExecution invocation;
 		
-		Map<String, Object> map = new HashMap<String, Object>();
+		
 		ArrayList<OperationExecution> invocations = new ArrayList<OperationExecution>();
 		
 		ValueMap valueMap = new ValueMap();
@@ -59,10 +58,11 @@ public class OpExecution4EditRow extends OpExecutionBuilder {
 					
 			ArrayList<Map<String, Object>> compositeValue = valueMap
 					.genValueMap(editRowSession.getTrId(), editRowSession.getColumns(), fieldsMap);
-
+			
+			Map<String, Object> map = new HashMap<String, Object>();
 			map.put(Constants.PARAMETER_ADD_ROW_COMPOSITE, compositeValue);
 
-			invocation = new OperationExecution(
+			OperationExecution invocation = new OperationExecution(
 					operationDefinition.getOperationId(), map);
 			invocations.add(invocation);
 
@@ -83,10 +83,11 @@ public class OpExecution4EditRow extends OpExecutionBuilder {
 						OperationsId.ModifyTuplesValuesByExpression.toString(),
 						service);
 
+				Map<String, Object> map = new HashMap<String, Object>();
 				map.put(Constants.PARAMETER_ADD_ROW_COMPOSITE, compositeValue);
 				map.put(Constants.PARAMETER_EDIT_ROW_CONDITION, exp);
 								
-				invocation = new OperationExecution(
+				OperationExecution invocation = new OperationExecution(
 						operationDefinition.getOperationId(), map);
 				invocations.add(invocation);
 			}