diff --git a/regression/test013.lama b/regression/test013.lama
index 65a37e308..6ef5ca6c2 100644
--- a/regression/test013.lama
+++ b/regression/test013.lama
@@ -1,6 +1,6 @@
 local n = read ();
 
-repeat
+do
   
   if n == 1 then write (0)
 elif n == 2 then write (1)
@@ -13,4 +13,4 @@ elif n == 4 then write (3)
 
   n := n - 1
 
-until (n == 0)
\ No newline at end of file
+while n != 0 od
\ No newline at end of file
diff --git a/regression/test016.lama b/regression/test016.lama
index f0d57022f..e8b9f9c11 100644
--- a/regression/test016.lama
+++ b/regression/test016.lama
@@ -4,11 +4,11 @@ n := read ();
 
 s := 1;
 
-repeat
+do
 
   s := s * n;
   n := n - 1
   
-until (n == 0);
+while n != 0 od;
 
 write (s)
\ No newline at end of file
diff --git a/regression/test023.lama b/regression/test023.lama
index 30c0e8365..62896333f 100644
--- a/regression/test023.lama
+++ b/regression/test023.lama
@@ -2,9 +2,9 @@ local s, n;
 
 s := 0;
 
-repeat
+do
   n := read ();
   s := s + n
-until (n == 0);
+while n != 0 od;
 
 write (s)  
diff --git a/regression/test103.lama b/regression/test103.lama
index ec852fc9b..7f6d15a2e 100644
--- a/regression/test103.lama
+++ b/regression/test103.lama
@@ -1,8 +1,8 @@
 local x;
 
-repeat
+do
   local n = read ();
   x := n
-until n > 0;
+while n <= 0 od;
 
 write (x)
diff --git a/src/Language.ml b/src/Language.ml
index 69e2dac2a..6f2028f2a 100644
--- a/src/Language.ml
+++ b/src/Language.ml
@@ -377,7 +377,7 @@ module Expr =
     (* empty statement            *) | Skip
     (* conditional                *) | If        of t * t * t
     (* loop with a pre-condition  *) | While     of t * t
-    (* loop with a post-condition *) | Repeat    of t * t
+    (* loop with a post-condition *) | DoWhile   of t * t
     (* pattern-matching           *) | Case      of t * (Pattern.t * t) list * Loc.t * atr
     (* ignore a value             *) | Ignore    of t
     (* unit value                 *) | Unit
@@ -537,8 +537,8 @@ module Expr =
          eval conf k (schedule_list [e; Control (fun (st, i, o, e::vs) -> (if Value.to_int e <> 0 then s1 else s2), (st, i, o, vs))])
       | While (e, s) ->
          eval conf k (schedule_list [e; Control (fun (st, i, o, e::vs) -> (if Value.to_int e <> 0 then seq s expr else Skip), (st, i, o, vs))])
-      | Repeat (s, e) ->
-         eval conf (seq (While (Binop ("==", e, Const 0), s)) k) s
+      | DoWhile (s, e) ->
+         eval conf (seq (While (e, s)) k) s
       | Case (e, bs, _, _)->
          let rec branch ((st, i, o, v::vs) as conf) = function
          | [] -> failwith (Printf.sprintf "Pattern matching failed: no branch is selected while matching %s\n" (show(Value.t) (fun _ -> "<expr>") (fun _ -> "<state>") v))
@@ -768,7 +768,7 @@ module Expr =
                   | _               -> Seq (i, While (c, Seq (b, s))))
                }
 
-      | %"repeat" s:scope[infix][Void] %"until" e:basic[infix][Val] => {isVoid atr} => {
+      | %"do" s:scope[infix][Void] %"while" e:parse[infix][Val] => {isVoid atr} =>  %"od" {
           materialize atr @@
             match s with
             | Scope (defs, s) ->
@@ -781,8 +781,8 @@ module Expr =
                    defs
                    ([], s)
                in
-               Scope (defs, Repeat (s, e))
-            | _  -> Repeat (s, e)
+               Scope (defs, DoWhile (s, e))
+            | _  -> DoWhile (s, e)
       }
       | %"case" l:$ e:parse[infix][Val] %"of" bs:!(Util.listBy)[ostap ("|")][ostap (!(Pattern.parse) -"->" scope[infix][atr])] %"esac"{Case (e, bs, l#coord, atr)}
       | l:$ %"lazy" e:basic[infix][Val] => {notRef atr} :: (not_a_reference l) => {env#add_import "Lazy"; ignore atr (Call (Var "makeLazy", [Lambda ([], e)]))}
@@ -1265,7 +1265,6 @@ let run_parser cmd =
     "skip";
     "if"; "then"; "else"; "elif"; "fi";
     "while"; "do"; "od";
-    "repeat"; "until";
     "for";
     "fun"; "local"; "public"; "external"; "import";
     "length";
diff --git a/src/SM.ml b/src/SM.ml
index bb99c7805..d3989f78b 100644
--- a/src/SM.ml
+++ b/src/SM.ml
@@ -862,12 +862,12 @@ let compile cmd ((imports, infixes), p) =
                                let env, _ , s  = compile_expr false cond env s in
                                env, false, [JMP cond; FLABEL loop] @ s @ [LABEL cond] @ se @ (if fe then [LABEL lexp] else []) @ [CJMP ("nz", loop)]
                                                                                                   
-  | Expr.Repeat (s, c)      -> let lexp , env = env#get_label in
+  | Expr.DoWhile (s, c)     -> let lexp , env = env#get_label in
                                let loop , env = env#get_label in
                                let check, env = env#get_label in
                                let env, fe  , se   = compile_expr false lexp env c in
                                let env, flag, body = compile_expr false check env s in
-                               env, false, [LABEL loop] @ body @ (if flag then [LABEL check] else []) @ se @ (if fe then [LABEL lexp] else []) @ [CJMP ("z", loop)]
+                               env, false, [LABEL loop] @ body @ (if flag then [LABEL check] else []) @ se @ (if fe then [LABEL lexp] else []) @ [CJMP ("nz", loop)]
 
   | Expr.Leave              -> env, false, []
                                  
diff --git a/src/version.ml b/src/version.ml
index f72e56537..9efbc8477 100644
--- a/src/version.ml
+++ b/src/version.ml
@@ -1 +1 @@
-let version = "Version 1.10, 7eb3e223b, Mon Jan 25 01:38:59 2021 +0300"
+let version = "Version 1.10, 297139c72, Sun Jan 31 19:11:03 2021 +0300"