diff --git a/src/main/java/avatartranslator/tosysmlv2/Avatar2SysML.java b/src/main/java/avatartranslator/tosysmlv2/Avatar2SysML.java
index 61f2f7e922e80748f317f70bc5feaeee791f22a0..3a087f91d3a3d12801a80bbe144b7364a166fd0a 100644
--- a/src/main/java/avatartranslator/tosysmlv2/Avatar2SysML.java
+++ b/src/main/java/avatartranslator/tosysmlv2/Avatar2SysML.java
@@ -107,7 +107,7 @@ public class Avatar2SysML {
     }
 
     /** increase indentation */
-    private void indent(int n) { for (int i= 0; i < n; i++) indent(1); }
+    private void indent(int n) { for (int i= 0; i < n; i++) indentation += indentStep; }
     /** decrease indentation */
     private void unindent(int n) { indentation = indentation.substring(n * indentStepSize); }
 
@@ -958,7 +958,7 @@ public class Avatar2SysML {
                         indent(1);
                         // sending request from pre-send state to send state
                         avsysml.append(sendRequest2SysML(1, "0", "0", signalinfo, ((AvatarActionOnSignal)aos).getOriginalValues()) + "\n");
-                        indentation = indentation.substring(2 * indentStepSize);
+                        unindent(2);
                         avsysml.append(indentation + ");\n");
                         // transition from pre-send state to send state
                         avsysml.append("\n" + indentation + "transition : '#AvatarTransition' first " + stateinfo.getPreName() +
@@ -972,7 +972,7 @@ public class Avatar2SysML {
                         indent(1);
                         // receiving request from pre-receive state to receive state
                         avsysml.append(receiveRequest2SysML(1, "0", "0", signalinfo.getName()) + "\n");
-                        indentation = indentation.substring(2 * indentStepSize);
+                        unindent(2);
                         avsysml.append(indentation + ");\n");
                         // transition from pre-receive state to receive state
                         avsysml.append("\n" + indentation + "transition : '#AvatarTransition' first " + stateinfo.getPreName() + "\n");
@@ -1015,7 +1015,7 @@ public class Avatar2SysML {
                     // put the specific sending request, carrying no value
                     avsysml.append(resetTimerRequest2SysML(1, "0", "0",
                             timerBlockSysMLname(((AvatarResetTimer) aos).getTimer().getName())) + "\n");
-                    indentation = indentation.substring(2 * indentStepSize);
+                    unindent(2);
                     avsysml.append(indentation + ");\n");
                     // put the associated transition
                     avsysml.append("\n" + indentation + "transition : '#AvatarTransition' first " + stateinfo.getPreName() +
@@ -1031,7 +1031,7 @@ public class Avatar2SysML {
                     // put the specific receiving request, carrying no value
                     avsysml.append(expireTimerRequest2SysML(1, "0", "0",
                             timerBlockSysMLname(((AvatarExpireTimer) aos).getTimer().getName())) + "\n");
-                    indentation = indentation.substring(2 * indentStepSize);
+                    unindent(2);
                     avsysml.append(indentation + ");\n");
                     // put the associated transition
                     avsysml.append("\n" + indentation + "transition : '#AvatarTransition' first " + stateinfo.getPreName() +
@@ -1210,7 +1210,7 @@ public class Avatar2SysML {
             sysMLrequests.append(setTimerRequest2SysML(transindex,
                     minDelay,
                     maxDelay,
-                    timerBlockSysMLname(((AvatarTimerOperator) target).getTimer().getName()) + ".'@set'",
+                    timerBlockSysMLname(((AvatarTimerOperator) target).getTimer().getName()),
                     ((AvatarSetTimer) target).getTimerValue()));
         else  if (requestType == 4) // Reset
             sysMLrequests.append(resetTimerRequest2SysML(transindex,
@@ -1537,7 +1537,7 @@ public class Avatar2SysML {
            j++;
         }
         result.append(indentation + "then done;\n");
-        
+
         unindent(1);
         result.append(indentation + "}");
         return result.toString();