diff --git a/gtsam/hybrid/GaussianMixtureFactor.h b/gtsam/hybrid/GaussianMixtureFactor.h
index b2fbe4aef..bd2e079cb 100644
--- a/gtsam/hybrid/GaussianMixtureFactor.h
+++ b/gtsam/hybrid/GaussianMixtureFactor.h
@@ -22,7 +22,7 @@
 
 #include <gtsam/discrete/DecisionTree.h>
 #include <gtsam/discrete/DiscreteKey.h>
-#include <gtsam/hybrid/HybridFactor.h>
+#include <gtsam/hybrid/HybridGaussianFactor.h>
 #include <gtsam/linear/GaussianFactor.h>
 
 namespace gtsam {
@@ -40,9 +40,9 @@ using GaussianFactorVector = std::vector<gtsam::GaussianFactor::shared_ptr>;
  * of discrete variables indexes to the continuous gaussian distribution.
  *
  */
-class GaussianMixtureFactor : public HybridFactor {
+class GaussianMixtureFactor : public HybridGaussianFactor {
  public:
-  using Base = HybridFactor;
+  using Base = HybridGaussianFactor;
   using This = GaussianMixtureFactor;
   using shared_ptr = boost::shared_ptr<This>;
 
@@ -93,7 +93,7 @@ class GaussianMixtureFactor : public HybridFactor {
   bool equals(const HybridFactor &lf, double tol = 1e-9) const override;
 
   void print(
-      const std::string &s = "HybridFactor\n",
+      const std::string &s = "GaussianMixtureFactor\n",
       const KeyFormatter &formatter = DefaultKeyFormatter) const override;
   /// @}
 
diff --git a/gtsam/hybrid/HybridGaussianFactor.h b/gtsam/hybrid/HybridGaussianFactor.h
index 8d457e778..4c8ede12c 100644
--- a/gtsam/hybrid/HybridGaussianFactor.h
+++ b/gtsam/hybrid/HybridGaussianFactor.h
@@ -27,7 +27,7 @@ namespace gtsam {
  * A HybridGaussianFactor is a layer over GaussianFactor so that we do not have
  * a diamond inheritance.
  */
-class HybridGaussianFactor : public HybridFactor {
+class GTSAM_EXPORT HybridGaussianFactor : public HybridFactor {
  private:
   GaussianFactor::shared_ptr inner_;
 
@@ -36,6 +36,12 @@ class HybridGaussianFactor : public HybridFactor {
   using This = HybridGaussianFactor;
   using shared_ptr = boost::shared_ptr<This>;
 
+  HybridGaussianFactor() = default;
+
+  HybridGaussianFactor(const KeyVector &continuousKeys,
+                       const DiscreteKeys &discreteKeys)
+      : Base(continuousKeys, discreteKeys) {}
+
   // Explicit conversion from a shared ptr of GF
   explicit HybridGaussianFactor(GaussianFactor::shared_ptr other);
 
@@ -51,7 +57,7 @@ class HybridGaussianFactor : public HybridFactor {
 
   /// GTSAM print utility.
   void print(
-      const std::string &s = "HybridFactor\n",
+      const std::string &s = "HybridGaussianFactor\n",
       const KeyFormatter &formatter = DefaultKeyFormatter) const override;
 
   /// @}