diff --git a/changelog.md b/changelog.md
index 2273c8e5..4d2194f9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,7 @@
 
 ## Features/Improvements :
 **[Units/Factions]** Added Mig-31, Su-30, Mi-24V, Mi-28N to Russia 2010 faction.
+**[Mission Generator]** Added a parameter to choose whether the JTACs should use smoke markers or not
 
 ## Fixed issues : 
 **[Units/Factions]** Fixed OH-58D not being used by AI
diff --git a/game/operation/operation.py b/game/operation/operation.py
index 470133dd..bb195358 100644
--- a/game/operation/operation.py
+++ b/game/operation/operation.py
@@ -201,13 +201,18 @@ class Operation:
             script = script + "\n"
 
             smoke = "true"
-            if hasattr(self.game, "jtac_smoke_on"):
+            print("JTAC")
+            print(self.game.settings.jtac_smoke_on)
+            print(hasattr(self.game, "jtac_smoke_on"))
+            if hasattr(self.game.settings, "jtac_smoke_on"):
                 if not self.game.settings.jtac_smoke_on:
                     smoke = "false"
 
             for jtac in self.game.jtacs:
                 script = script + "\n" + "JTACAutoLase('" + str(jtac[2]) + "', " + str(jtac[1]) + ", " + smoke + ", \"vehicle\")" + "\n"
 
+                print("\n" + "JTACAutoLase('" + str(jtac[2]) + "', " + str(jtac[1]) + ", " + smoke + ", \"vehicle\")" + "\n")
+
             load_autolase.add_action(DoScript(String(script)))
         self.current_mission.triggerrules.triggers.append(load_autolase)
 
diff --git a/qt_ui/windows/settings/QSettingsWindow.py b/qt_ui/windows/settings/QSettingsWindow.py
index 195eeb87..d5c27b3b 100644
--- a/qt_ui/windows/settings/QSettingsWindow.py
+++ b/qt_ui/windows/settings/QSettingsWindow.py
@@ -186,7 +186,7 @@ class QSettingsWindow(QDialog):
         self.gameplayLayout.addWidget(self.generate_marks, 1, 1, Qt.AlignRight)
         self.gameplayLayout.addWidget(QLabel("Include JTAC (If available)"), 2, 0)
         self.gameplayLayout.addWidget(self.include_jtac_if_available, 2, 1, Qt.AlignRight)
-        self.gameplayLayout.addWidget(QLabel("Enable JTAC smoke markers"), 2, 0)
+        self.gameplayLayout.addWidget(QLabel("Enable JTAC smoke markers"), 3, 0)
         self.gameplayLayout.addWidget(self.jtac_smoke_on, 3, 1, Qt.AlignRight)
 
         self.performance = QGroupBox("Performance")