diff --git a/include/eepp/core/string.hpp b/include/eepp/core/string.hpp
index 8282e3c3c..b38317de7 100644
--- a/include/eepp/core/string.hpp
+++ b/include/eepp/core/string.hpp
@@ -985,6 +985,8 @@ class EE_API String {
 		return buffer;
 	}
 
+	const StringType& getString() const { return mString; }
+
   private:
 	friend EE_API bool operator==( const String& left, const String& right );
 	friend EE_API bool operator<( const String& left, const String& right );
diff --git a/src/tools/ecode/projectbuild.cpp b/src/tools/ecode/projectbuild.cpp
index f658e9862..29bed545e 100644
--- a/src/tools/ecode/projectbuild.cpp
+++ b/src/tools/ecode/projectbuild.cpp
@@ -800,7 +800,9 @@ std::optional<ProjectBuildStep> ProjectBuildManager::getCurrentRunConfig() {
 		if ( build != nullptr && build->hasRun() ) {
 			for ( const auto& crun : build->mRun ) {
 				if ( crun->name == mConfig.runName || mConfig.runName.empty() ) {
-					return build->replaceVars( *crun.get() );
+					ProjectBuildCommand res( build->replaceVars( *crun.get() ) );
+					replaceDynamicVars( res );
+					return res;
 				}
 			}
 		}