Index: src/ControlStruct/LabelFixer.cc
===================================================================
--- src/ControlStruct/LabelFixer.cc	(revision 5f2f2d75adcd9f673ef8bda86f25d409347089be)
+++ src/ControlStruct/LabelFixer.cc	(revision de62360d1d2709386152807b3d18e159e241ab1f)
@@ -9,7 +9,7 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 02 15:30:32 2015
-// Update Count     : 93
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jun 23 12:42:23 2015
+// Update Count     : 96
 //
 
@@ -137,9 +137,8 @@
 				Label undef = from.back()->get_target();
 				throw SemanticError ( "'" + undef + "' label not defined");
-			}
+			} // if
 
-			// generate a new label, and attach it to its defining statement
-			// as the only label on that statement
-			Label finalLabel = generator->newLabel();
+			// generate a new label, and attach it to its defining statement as the only label on that statement
+			Label finalLabel = generator->newLabel( to->get_labels().back() );
 			entry->set_label( finalLabel );
 
Index: src/ControlStruct/LabelGenerator.cc
===================================================================
--- src/ControlStruct/LabelGenerator.cc	(revision 5f2f2d75adcd9f673ef8bda86f25d409347089be)
+++ src/ControlStruct/LabelGenerator.cc	(revision de62360d1d2709386152807b3d18e159e241ab1f)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:45:07 2015
-// Update Count     : 12
+// Last Modified On : Tue Jun 23 12:18:34 2015
+// Update Count     : 13
 //
 
@@ -29,5 +29,5 @@
 	}
 
-	Label LabelGenerator::newLabel(std::string suffix) {
+	Label LabelGenerator::newLabel( std::string suffix ) {
 		std::ostringstream os;
 		os << "__L" << current++ << "__" << suffix;