diff --git a/lib/combinat.gi b/lib/combinat.gi
index 76bebf9377b..9d312184968 100644
--- a/lib/combinat.gi
+++ b/lib/combinat.gi
@@ -2500,7 +2500,7 @@ InstallGlobalFunction( IteratorOfPartitionsSet, function( s )
       return out;
     end;
 
-    shallowCopy := iter -> rec( next := ShallowCopy( iter!.next ) );
+    shallowCopy := iter -> rec( next := ShallowCopy( iter!.next ), s := iter!.s );
 
     isDone := iter -> iter!.next = false;
 
diff --git a/tst/testinstall/combinat.tst b/tst/testinstall/combinat.tst
index ff0765e0646..538e5a631b4 100644
--- a/tst/testinstall/combinat.tst
+++ b/tst/testinstall/combinat.tst
@@ -461,30 +461,22 @@ gap> NrRestrictedPartitions( 100, [2,3,5,7,11,13,17], 10 );
 
 #F  IteratorOfPartitions( <n> )
 gap> for n in [ 1 .. 15 ] do
->      pn:= Partitions( n );
->      iter:= IteratorOfPartitions( n );
->      list:= [];
->      for i in [ 1 .. Length( pn ) ] do
->        Add( list, NextIterator( iter ) );
->      od;
->      if not IsDoneIterator( iter ) then
+>      pn1:= Partitions( n );
+>      pn2:= List( IteratorOfPartitions( n ) );
+>      if Length(pn1) <> Length(pn2) then
 >        Error( "wrong number of elements" );
->      elif pn <> list then
+>      elif pn1 <> pn2 then
 >        Error( "different elements" );
 >      fi;
 >    od;
 
 #F  IteratorOfPartitionsSet( <set> )
 gap> for s in [[], [5], [1,2,3,4], [2,5,7], ["a","b","c","d","e"], [3..13]] do
->      pn:= PartitionsSet( s );
->      iter:= IteratorOfPartitionsSet( s );
->      list:= [];
->      for i in [ 1 .. Length( pn ) ] do
->        Add( list, NextIterator( iter ) );
->      od;
->      if not IsDoneIterator( iter ) then
+>      pn1:= PartitionsSet( s );
+>      pn2:= List( IteratorOfPartitionsSet( s ) );
+>      if Length(pn1) <> Length(pn2) then
 >        Error( "wrong number of elements" );
->      elif Set(pn) <> Set(list) then
+>      elif Set(pn1) <> Set(pn2) then
 >        Error( "different elements" );
 >      fi;
 >    od;