diff --git a/src/MultiIndices/FixedMultiIndexSet.cpp b/src/MultiIndices/FixedMultiIndexSet.cpp
index 9a539366..4fe48868 100644
--- a/src/MultiIndices/FixedMultiIndexSet.cpp
+++ b/src/MultiIndices/FixedMultiIndexSet.cpp
@@ -244,26 +244,42 @@ std::vector<unsigned int> FixedMultiIndexSet<Kokkos::HostSpace>::IndexToMulti(un
     return output;
 }
 
-
-template<typename MemorySpace>
-std::vector<unsigned int> FixedMultiIndexSet<MemorySpace>::NonzeroDiagonalEntries() const
-{
-    assert(false);
-    return std::vector<unsigned int>();
-}
-
-template<>
-std::vector<unsigned int> FixedMultiIndexSet<Kokkos::HostSpace>::NonzeroDiagonalEntries() const
-{
+std::vector<unsigned int> CompressedNonzeroDiagonalEntries(
+    const Kokkos::View<unsigned int*, Kokkos::HostSpace> &nzStarts,
+    const Kokkos::View<unsigned int*, Kokkos::HostSpace> &nzDims,
+    unsigned int dim) {
     std::vector<unsigned int> output;
-    if(!isCompressed) throw std::runtime_error("NonzeroDiagonalEntries only works for compressed multiindex sets");
     for(unsigned int midx = 0; midx < nzStarts.extent(0)-1; midx++){
         if(nzStarts(midx) == nzStarts(midx+1)) continue;
-        if(nzDims(nzStarts(midx+1)-1) == this->dim-1) output.push_back(midx);
+        if(nzDims(nzStarts(midx+1)-1) == dim-1) output.push_back(midx);
+    }
+    return output;
+}
+
+std::vector<unsigned int> UncompressedNonzeroDiagonalEntries(
+    const Kokkos::View<unsigned int*, Kokkos::HostSpace> &orders,
+    unsigned int dim) {
+    std::vector<unsigned int> output;
+    for(unsigned int midx = 0; midx < orders.extent(0)/dim; midx++){
+        bool isDiagonal = orders((midx+1)*dim-1) > 0;
+        if(isDiagonal) output.push_back(midx);
     }
     return output;
 }
 
+template<typename MemorySpace>
+std::vector<unsigned int> FixedMultiIndexSet<MemorySpace>::NonzeroDiagonalEntries() const
+{
+    Kokkos::View<unsigned int*, Kokkos::HostSpace> h_nzStarts = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), nzStarts);
+    Kokkos::View<unsigned int*, Kokkos::HostSpace> h_nzDims = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), nzDims);
+    Kokkos::View<unsigned int*, Kokkos::HostSpace> h_nzOrders = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), nzOrders);
+    if(isCompressed) {
+        return CompressedNonzeroDiagonalEntries(h_nzStarts, h_nzDims, this->dim);
+    } else {
+        return UncompressedNonzeroDiagonalEntries(h_nzOrders, this->dim);
+    }
+}
+
 template<typename MemorySpace>
 int FixedMultiIndexSet<MemorySpace>::MultiToIndex(std::vector<unsigned int> const& multi) const
 {
diff --git a/tests/MultiIndices/Test_MultiIndexSet.cpp b/tests/MultiIndices/Test_MultiIndexSet.cpp
index ac5ec68d..7ed8472a 100644
--- a/tests/MultiIndices/Test_MultiIndexSet.cpp
+++ b/tests/MultiIndices/Test_MultiIndexSet.cpp
@@ -499,6 +499,15 @@ TEST_CASE("Testing the MultiIndexSet class", "[MultiIndexSet]" ) {
             expected_size += multi.HasNonzeroEnd();
         }
         REQUIRE( expected_size == inds.size() );
+        FixedMultiIndexSet<Kokkos::HostSpace> fixedSet = set.Fix(true);
+        FixedMultiIndexSet<Kokkos::HostSpace> fixedSet2 = set.Fix(false);
+        std::vector<unsigned int> inds_fixed = fixedSet.NonzeroDiagonalEntries();
+        std::vector<unsigned int> inds_fixed2 = fixedSet2.NonzeroDiagonalEntries();
+        std::sort(inds.begin(), inds.end());
+        std::sort(inds_fixed.begin(), inds_fixed.end());
+        std::sort(inds_fixed2.begin(), inds_fixed2.end());
+        REQUIRE( inds == inds_fixed );
+        REQUIRE( inds == inds_fixed2 );
         MultiIndexSet full_set = MultiIndexSet::CreateTotalOrder(dim, maxOrder, MultiIndexLimiter::NonzeroDiagTotalOrderLimiter(maxOrder));
         inds = full_set.NonzeroDiagonalEntries();
         REQUIRE( inds.size() == full_set.Size() );