diff --git a/aceto.py b/aceto.py
index db8220d..cc1415e 100644
--- a/aceto.py
+++ b/aceto.py
@@ -116,6 +116,7 @@ def step(self):
         except IndexError:
             cmd = ' '  # nop
         self.log(1, cmd, end='') if cmd != ' ' else None
+        self.log(2, "\nMODE:", self.mode)
         if self.mode == 'command':
             method = self.commands.get(cmd, Aceto._nop)
             method(self, cmd)
@@ -146,6 +147,7 @@ def step(self):
             self.move()
         elif self.mode == 'escape':
             self.move()
+            self.mode = 'command'
 
     def move(self, coords=None):
         if coords is not None:
@@ -482,7 +484,7 @@ def _restart(self, cmd) -> 'O':
             self.x, self.y = 0, 0
         else:
             length = 2**self.p
-            self.x, self.y = length-1, length-1
+            self.x, self.y = 0, length-1
 
     def _getch(self, cmd) -> ',':
         ch = getch()