diff --git a/gap/structure.gi b/gap/structure.gi
index b0fa165..49a4815 100644
--- a/gap/structure.gi
+++ b/gap/structure.gi
@@ -20,12 +20,12 @@ InstallGlobalFunction(LeftQuasigroup, function(arg)
   fi;
   # Extract the family
   if IsFamily(arg[1]) then
-    fam = arg[1];
+    fam := arg[1];
     Remove(arg, 1);
-    arg = Flat(arg);
+    arg := Flat(arg);
   else
-    arg = Flat(arg);
-    fam = FamilyObj(arg[1]);
+    arg := Flat(arg);
+    fam := FamilyObj(arg[1]);
   fi;
   return CloneOfTypeByGenerators(IsLeftQuasigroup, fam, arg,
                                  GeneratorsOfLeftQuasigroup);
@@ -38,12 +38,12 @@ InstallGlobalFunction(LeftRack, function(arg)
   fi;
   # Extract the family
   if IsFamily(arg[1]) then
-    fam = arg[1];
+    fam := arg[1];
     Remove(arg, 1);
-    arg = Flat(arg);
+    arg := Flat(arg);
   else
-    arg = Flat(arg);
-    fam = FamilyObj(arg[1]);
+    arg := Flat(arg);
+    fam := FamilyObj(arg[1]);
   fi;
   return CloneOfTypeByGenerators(IsLeftRack, fam, arg,
                                  GeneratorsOfLeftQuasigroup);
@@ -56,12 +56,12 @@ InstallGlobalFunction(RightQuasigroup, function(arg)
   fi;
   # Extract the family
   if IsFamily(arg[1]) then
-    fam = arg[1];
+    fam := arg[1];
     Remove(arg, 1);
-    arg = Flat(arg);
+    arg := Flat(arg);
   else
-    arg = Flat(arg);
-    fam = FamilyObj(arg[1]);
+    arg := Flat(arg);
+    fam := FamilyObj(arg[1]);
   fi;
   return CloneOfTypeByGenerators(IsRightQuasigroup, fam, arg,
                                  GeneratorsOfRightQuasigroup);
@@ -74,12 +74,12 @@ InstallGlobalFunction(RightRack, function(arg)
   fi;
   # Extract the family
   if IsFamily(arg[1]) then
-    fam = arg[1];
+    fam := arg[1];
     Remove(arg, 1);
-    arg = Flat(arg);
+    arg := Flat(arg);
   else
-    arg = Flat(arg);
-    fam = FamilyObj(arg[1]);
+    arg := Flat(arg);
+    fam := FamilyObj(arg[1]);
   fi;
   return CloneOfTypeByGenerators(IsRightRack, fam, arg,
                                  GeneratorsOfRightQuasigroup);