diff --git a/SU2_CFD/src/fluid/CMutationTCLib.cpp b/SU2_CFD/src/fluid/CMutationTCLib.cpp
index 113c0de4ba1..903f5abdbc1 100644
--- a/SU2_CFD/src/fluid/CMutationTCLib.cpp
+++ b/SU2_CFD/src/fluid/CMutationTCLib.cpp
@@ -52,8 +52,17 @@ CMutationTCLib::CMutationTCLib(const CConfig* config, unsigned short val_nDim):
 
   opt.setStateModel("ChemNonEqTTv");
   if (frozen) opt.setMechanism("none");
-  opt.setViscosityAlgorithm(transport_model);
-  opt.setThermalConductivityAlgorithm(transport_model);
+  
+  if (transport_model == "Gupta-Yos")
+  {
+      opt.setViscosityAlgorithm(transport_model);
+      opt.setThermalConductivityAlgorithm("Chapmann-Enskog_LDLT");
+  }
+  else
+  {
+      opt.setViscosityAlgorithm(transport_model);
+      opt.setThermalConductivityAlgorithm(transport_model);
+  }
 
   /* Initialize mixture object */
   mix.reset(new Mutation::Mixture(opt));