Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -rc22fec13a9cc724397d5b3564cb08d72740013ba
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision c22fec13a9cc724397d5b3564cb08d72740013ba)
@@ -168,10 +168,11 @@
 
 	// Create an empty list to copy the wiki pages into
 	Set<WikiPage> sessionWikiPages = new HashSet<WikiPage>();
-
+	
 	// Here we need to clone wikipages and content for tool session versions
-	for (WikiPage childPage : wiki.getWikiPages()) {
-
+	//for (WikiPage childPage : wiki.getWikiPages()) {  // LDEV-2436
+	for (WikiPage childPage : (List<WikiPage>) wikiDAO.findByProperty(WikiPage.class, "parentWiki", wiki)) {
+	
 	    // check that this page does not already have a session
 	    if (childPage.getWikiSession() != null) {
 		continue;