diff --git a/conandata.yml b/conandata.yml
index b093735b32..c4d6f0338b 100644
--- a/conandata.yml
+++ b/conandata.yml
@@ -1,7 +1,7 @@
 version: "5.14.0-alpha.0"
 commit: "unknown"
 requirements:
-  - "cura-formulae-engine/1.2.0@ultimaker/testing"
+  - "cura-formulae-engine/1.2.1@ultimaker/testing"
   - "scripta/[>=1.1.0]@ultimaker/testing"
   - "libpng/1.6.48"
   - "onetbb/2022.3.0"
diff --git a/src/gcode_export/GcodeTemplateResolver.cpp b/src/gcode_export/GcodeTemplateResolver.cpp
index f3406196fc..2e0ebe9183 100644
--- a/src/gcode_export/GcodeTemplateResolver.cpp
+++ b/src/gcode_export/GcodeTemplateResolver.cpp
@@ -245,7 +245,7 @@ std::string GcodeTemplateResolver::resolveGCodeTemplate(
     std::string output;
     GcodeConditionState condition_state = GcodeConditionState::OutsideCondition;
 
-    static const boost::regex expression_regex(R"({\s*(?<condition>if|else|elif|endif)?\s*(?<expression>[^{}]*?)\s*(?:,\s*(?<extruder_nr>[^{},]*))?\s*}(?<end_of_line>\n?))");
+    static const boost::regex expression_regex(R"({\s*(?<condition>if|else|elif|endif)?\s*(?<expression>[^{}]*?)\s*(?:,\s*(?<extruder_nr>[^{},'"]+))?\s*}(?<end_of_line>\n?))");
 
     // Create local environment containing the context-specific extra settings, and are chained to the extruder and global environment
     std::map<std::optional<size_t>, std::shared_ptr<cfe::env::LocalEnvironment>> local_environments;