diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularGuavaTableHandler.java b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularGuavaTableHandler.java
index e018cef42041..c632c86eee89 100644
--- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularGuavaTableHandler.java
+++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularGuavaTableHandler.java
@@ -119,11 +119,11 @@ class SingularGuavaTableHandler extends SingularMapHandler {
 
   @Override
   protected String getOneMethodBody(@NotNull String singularName, @NotNull BuilderInfo info) {
-    final String codeBlockTemplate = "if (this.{0} == null) this.{0} = {2}.{3}; \n" +
+    final String codeBlockTemplate = "if (this.{0} == null) this.{0} = {1}.{2}; \n" +
                                      "this.{0}.put(" + LOMBOK_ROW_KEY + ", " + LOMBOK_COLUMN_KEY + ", " + LOMBOK_VALUE + ");\n" +
-                                     "return {4};";
+                                     "return {3};";
 
-    return MessageFormat.format(codeBlockTemplate, info.getFieldName(), singularName, collectionQualifiedName,
+    return MessageFormat.format(codeBlockTemplate, info.getFieldName(), collectionQualifiedName,
                                 sortedCollection ? "naturalOrder()" : "builder()", info.getBuilderChainResult());
   }