diff --git a/robot.cpp b/robot.cpp
index 22028bc..cf95892 100644
--- a/robot.cpp
+++ b/robot.cpp
@@ -43,7 +43,7 @@ static void emulate_robot(robot_code &code, robot_regs& r, char robot_id) {
 
     const auto cmd_arg = (short)(code.code[code.PC] & (~ROBOT_CMD_MASK));
 
-    switch ((short)(code.code[code.PC] & (short)ROBOT_CMD_MASK)) {
+    switch (code.code[code.PC] & (short)ROBOT_CMD_MASK) {
         case ROBOT_CMD_MOVE_TO_ZONE_code:
             // двигаемся в сторону цели
             if (robot_move(r, (short)(cmd_arg & (~ROBOT_WITH_BARREL)), robot_id)) {
@@ -102,7 +102,7 @@ static void emulate_robot(robot_code &code, robot_regs& r, char robot_id) {
 
         case ROBOT_CMD_TMR_SET_code:
             if (code.barrel_id >= 0) {
-                barrels[code.barrel_id].software_timer = code.code[code.PC + 1];
+                barrels[code.barrel_id].software_timer = code.code[code.PC];
                 r.mz.is_up = 0;
             }
             code.PC++;