diff --git a/hecl/extern/boo b/hecl/extern/boo
index a83250445..7bda89073 160000
--- a/hecl/extern/boo
+++ b/hecl/extern/boo
@@ -1 +1 @@
-Subproject commit a8325044567a0e629fb4a04b8d23ff57225f84a9
+Subproject commit 7bda89073daeec487f9c82f220f199a687a1826b
diff --git a/hecl/include/hecl/PipelineBase.hpp b/hecl/include/hecl/PipelineBase.hpp
index b109c81f7..79a1ff870 100644
--- a/hecl/include/hecl/PipelineBase.hpp
+++ b/hecl/include/hecl/PipelineBase.hpp
@@ -183,10 +183,16 @@ public:
                         std::is_base_of<TessellationShader, I>,
                         std::is_same<P, PlatformType::Metal>>>* = 0)
     {
-        m_vertex = conv.getVertexConverter().convert(ctx, in);
-        m_fragment = conv.getFragmentConverter().convert(ctx, in);
         if (in.HasTessellation)
+        {
+            m_control = conv.getControlConverter().convert(ctx, in);
             m_evaluation = conv.getEvaluationConverter().convert(ctx, in);
+        }
+        else
+        {
+            m_vertex = conv.getVertexConverter().convert(ctx, in);
+        }
+        m_fragment = conv.getFragmentConverter().convert(ctx, in);
         m_vtxFmt = in.VtxFmt;
         m_additionalInfo = in.PipelineInfo;
         MakeHash();