@@ -417,7 +417,11 @@ def create_run_test(output)
     output.puts("        return;")
     output.puts("#endif")
     output.puts("    Unity.NumberOfTests++;")
+    output.puts("#ifdef UNITY_DETAIL_STACK_SIZE")
+    output.puts("    Unity.CurrentDetailStackSize = 0;")
+    output.puts("#else")
     output.puts("    UNITY_CLR_DETAILS();")
+    output.puts("#endif")
     output.puts("    UNITY_EXEC_TIME_START();")
     output.puts("    CMock_Init();")
     output.puts("    if (TEST_PROTECT())")
 
@@ -2527,8 +2527,12 @@ void UnityBegin(const char* filename)
     Unity.TestIgnores = 0;
     Unity.CurrentTestFailed = 0;
     Unity.CurrentTestIgnored = 0;
-
+#ifdef UNITY_DETAIL_STACK_SIZE
+    Unity.CurrentDetailStackSize = 0;
+#else
     UNITY_CLR_DETAILS();
+#endif
+
     UNITY_OUTPUT_START();
 }
 
 
@@ -1318,8 +1318,8 @@ int UnityTestMatches(void);
 #define UNITY_DETAIL_PUSH(label, value)                                                          UnityPushDetail((UNITY_DETAIL_LABEL_TYPE)(label), (UNITY_DETAIL_VALUE_TYPE)(value), __LINE__)
 #define UNITY_DETAIL_POP(label, value)                                                           UnityPopDetail((UNITY_DETAIL_LABEL_TYPE)(label), (UNITY_DETAIL_VALUE_TYPE)(value), __LINE__)
 #else
-#define UNITY_DETAIL_PUSH(label, value)                                                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDetailStack)
-#define UNITY_DETAIL_POP(label, value)                                                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDetailStack)
+#define UNITY_DETAIL_PUSH(label, value)                                                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)(__LINE__), UnityStrErrDetailStack)
+#define UNITY_DETAIL_POP(label, value)                                                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(__LINE__), UnityStrErrDetailStack)
 #endif
 
 /* End of UNITY_INTERNALS_H */