diff --git a/spirv_msl.cpp b/spirv_msl.cpp
index 8aabaa84..83cca0bb 100644
--- a/spirv_msl.cpp
+++ b/spirv_msl.cpp
@@ -4859,7 +4859,9 @@ string CompilerMSL::convert_row_major_matrix(string exp_str, const SPIRType &exp
 // Called automatically at the end of the entry point function
 void CompilerMSL::emit_fixup()
 {
-	if ((get_entry_point().model == ExecutionModelVertex) && stage_out_var_id && !qual_pos_var_name.empty())
+	if ((get_execution_model() == ExecutionModelVertex ||
+	     get_execution_model() == ExecutionModelTessellationEvaluation) &&
+	    stage_out_var_id && !qual_pos_var_name.empty() && !capture_output_to_buffer)
 	{
 		if (options.vertex.fixup_clipspace)
 			statement(qual_pos_var_name, ".z = (", qual_pos_var_name, ".z + ", qual_pos_var_name,