diff --git a/gtsam/inference/IndexFactor.cpp b/gtsam/inference/IndexFactor.cpp
index 6f71599a3..c7fd753f6 100644
--- a/gtsam/inference/IndexFactor.cpp
+++ b/gtsam/inference/IndexFactor.cpp
@@ -29,12 +29,6 @@ namespace gtsam {
 	/* ************************************************************************* */
 	void IndexFactor::assertInvariants() const {
 		Base::assertInvariants();
-//#ifndef NDEBUG
-//#ifndef GTSAM_NO_ENFORCE_ORDERING
-//		std::set<Index> uniqueSorted(keys_.begin(), keys_.end());
-//		assert(uniqueSorted.size() == keys_.size() && std::equal(uniqueSorted.begin(), uniqueSorted.end(), keys_.begin()));
-//#endif
-//#endif
 	}
 
 	/* ************************************************************************* */
diff --git a/gtsam/inference/IndexFactor.h b/gtsam/inference/IndexFactor.h
index bfe270eb5..c2b76220e 100644
--- a/gtsam/inference/IndexFactor.h
+++ b/gtsam/inference/IndexFactor.h
@@ -38,7 +38,7 @@ namespace gtsam {
 
 	protected:
 
-		// Internal function for checking class invariants (sorted keys for this factor)
+		// Internal function for checking class invariants (unique keys for this factor)
 		void assertInvariants() const;
 
 	public:
diff --git a/gtsam/linear/JacobianFactor.cpp b/gtsam/linear/JacobianFactor.cpp
index 629015a54..19f4b8455 100644
--- a/gtsam/linear/JacobianFactor.cpp
+++ b/gtsam/linear/JacobianFactor.cpp
@@ -45,7 +45,7 @@ namespace gtsam {
   /* ************************************************************************* */
   inline void JacobianFactor::assertInvariants() const {
   #ifndef NDEBUG
-    IndexFactor::assertInvariants(); // The base class checks for sorted keys
+    GaussianFactor::assertInvariants(); // The base class checks for unique keys
     assert((size() == 0 && Ab_.rows() == 0 && Ab_.nBlocks() == 0) || size()+1 == Ab_.nBlocks());
     assert(firstNonzeroBlocks_.size() == Ab_.rows());
     for(size_t i=0; i<firstNonzeroBlocks_.size(); ++i)