diff --git a/javafx-template/src/main/java/app/Calc.java b/javafx-template/src/main/java/app/Calc.java
index 231878cb2fcd5500d19f51a1f68facc5203e2828..6c740f4bfa105a22501d1369dbe8ed2278bc68ae 100644
--- a/javafx-template/src/main/java/app/Calc.java
+++ b/javafx-template/src/main/java/app/Calc.java
@@ -89,8 +89,8 @@ public class Calc {
         if (getOperandCount() < 2) {
             throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
         }
-        var op1 = popOperand();
         var op2 = popOperand();
+        var op1 = popOperand();
         var result = op.apply(op1, op2);
         pushOperand(result);
         return result;
diff --git a/modules-template/core/src/main/java/core/Calc.java b/modules-template/core/src/main/java/core/Calc.java
index 9b0f4c976eb8e418641811e6d4c56d2d5ce0fdb5..ed63b1195bb395a9298af1fa8265f788ec84f56f 100644
--- a/modules-template/core/src/main/java/core/Calc.java
+++ b/modules-template/core/src/main/java/core/Calc.java
@@ -85,8 +85,8 @@ public class Calc {
         if (getOperandCount() < 2) {
             throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
         }
-        var op1 = popOperand();
         var op2 = popOperand();
+        var op1 = popOperand();
         var result = op.apply(op1, op2);
         pushOperand(result);
         return result;
diff --git a/modules-template/ui/pom.xml b/modules-template/ui/pom.xml
index 8bc1cfe7f0b004ce6a87e44b889e84a0deb44cfb..0660fec1ff8495f10009a44030ca4a72cf22f543 100644
--- a/modules-template/ui/pom.xml
+++ b/modules-template/ui/pom.xml
@@ -1,7 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>it1901</groupId>
     <artifactId>modules-ui</artifactId>
 
     <parent>
diff --git a/packages-template/src/main/java/core/Calc.java b/packages-template/src/main/java/core/Calc.java
index 9b0f4c976eb8e418641811e6d4c56d2d5ce0fdb5..ed63b1195bb395a9298af1fa8265f788ec84f56f 100644
--- a/packages-template/src/main/java/core/Calc.java
+++ b/packages-template/src/main/java/core/Calc.java
@@ -85,8 +85,8 @@ public class Calc {
         if (getOperandCount() < 2) {
             throw new IllegalStateException("Too few operands (" + getOperandCount() + ") on the stack");
         }
-        var op1 = popOperand();
         var op2 = popOperand();
+        var op1 = popOperand();
         var result = op.apply(op1, op2);
         pushOperand(result);
         return result;