--- ECHO_content/ECHO_collection.py	2004/05/06 13:05:49	1.54
+++ ECHO_content/ECHO_collection.py	2004/05/06 13:29:45	1.56
@@ -857,7 +857,7 @@ class ECHO_collection(Folder, Persistent
         elif hasattr(self,'collection_index_template'):
             return self.collection_index_template()    
         elif hasattr(self,'main_index_template'):
-            return self.collection_index_template()    
+            return self.main_index_template()    
         
         pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
         pt.content_type="text/html"
@@ -945,13 +945,15 @@ class ECHO_group(ECHO_collection):
 		
 		if 'index.html' in self.__dict__.keys():
 			return getattr(self,'index.html')()
-
+		
 		elif 'overview' in self.__dict__.keys():
-		    return self.showOverview()
+			return self.showOverview()
 		elif hasattr(self,'group_index_template'):
-		    return self.group_index_template()   
+			return self.group_index_template()
+		elif hasattr(self,'collection_index_template'):
+			return self.collection_index_template()    
 		elif hasattr(self,'main_index_template'):
-		    return self.collection_index_template()    
+		    return self.main_index_template()    
 
 		pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
 		pt.content_type="text/html"