diff -aur grub-0.97.org/stage2/builtins.c grub-0.97.work/stage2/builtins.c
--- grub-0.97.org/stage2/builtins.c	2008-10-28 20:22:57.000000000 +0100
+++ grub-0.97.work/stage2/builtins.c	2008-10-28 20:25:50.000000000 +0100
@@ -2855,14 +2855,14 @@
   while (next_partition (current_drive, 0xFFFFFF, &part, &type,
 			 &start, &len, &offset, &entry,
 			 &ext_offset, &gpt_offset, &gpt_count, &gpt_size, mbr))
-	  /* The partition may not be a GPT partition.  */
-	  if (gpt_offset != 0)
+    {
+      /* The partition may not be a GPT partition.  */
+      if (gpt_offset != 0)
 	    {
 		errnum = ERR_BAD_ARGUMENT;
 		return 1;
 	    }
-
-    {
+    
       if (part == current_partition)
 	{
 	  /* Found.  */
diff -aur grub-0.97.org/stage2/disk_io.c grub-0.97.work/stage2/disk_io.c
--- grub-0.97.org/stage2/disk_io.c	2008-10-28 20:22:57.000000000 +0100
+++ grub-0.97.work/stage2/disk_io.c	2008-10-28 20:27:57.000000000 +0100
@@ -526,14 +526,13 @@
   while (next_partition (current_drive, 0xFFFFFF, &part, &type,           
 			 &start, &len, &offset, &entry,
 			 &ext_offset, &gpt_offset, &gpt_count, &gpt_size, mbr))
-	  /* The partition may not be a GPT partition.  */
-	  if (gpt_offset != 0)
+    {                                                                       
+      /* The partition may not be a GPT partition.  */
+      if (gpt_offset != 0)
 	    {
 		errnum = ERR_BAD_ARGUMENT;
 		return 1;
 	    }
-
-    {                                                                       
       if (part == current_partition)
 	{
 	  /* Found.  */