diff --git a/lib/grpfp.gi b/lib/grpfp.gi
index 3466204b8b..b84ded14ab 100644
--- a/lib/grpfp.gi
+++ b/lib/grpfp.gi
@@ -4051,6 +4051,7 @@ local mappow, G, max, p, gens, rels, comb, i, l, m, H, t, gen, sz,
             RelatorsOfFpGroup(G),[gen],true,false:
               cyclic:=true,limit:=1+max,quiet:=true );
     fi;
+
     if t=fail then
       # we cannot get the size within the permitted limits -- give up
       return fail;
@@ -4098,6 +4099,8 @@ local mappow, G, max, p, gens, rels, comb, i, l, m, H, t, gen, sz,
     max:=10^3*sz;
   fi;
 
+  amax:=Maximum(amax,max+1);
+
   useind:=false;
   t1:=timerFunc();
   while max<amax do