diff --git a/init_setup_files_v2/create_yml_schema.py b/init_setup_files_v2/create_yml_schema.py
index 2029a2f..19603ce 100644
--- a/init_setup_files_v2/create_yml_schema.py
+++ b/init_setup_files_v2/create_yml_schema.py
@@ -159,9 +159,9 @@ def create_model(source_name: str, source_table_name: str, t_name: str, columns:
         formatted_columns = ',\n               '.join(
             f"{quote_value_with_dot(c)} as `{convert_value_to_system_standard(c)}`" for c in columns)
 
+    file_data = file_data.replace("fields", formatted_columns)
     file_data = file_data.replace("source_name", source_name)
     file_data = file_data.replace("source_table_name", source_table_name)
-    file_data = file_data.replace("fields", formatted_columns)
 
     output_path = f"models/staging/{source_name}/{t_name}.sql"