Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -rd52e38e168a77a2c8b0e58dfdde7d1e73fcfda31 -r2ac039eeb6b49f34b1782fed80e7b7a637eaf6ad
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision d52e38e168a77a2c8b0e58dfdde7d1e73fcfda31)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 2ac039eeb6b49f34b1782fed80e7b7a637eaf6ad)
@@ -1259,8 +1259,8 @@
 		ToolContent newContent = new ToolContent(newTool);
 		toolContentDAO.saveToolContent(newContent);
 
-		// put new toolContent and it is old toolContentID into
-		toolMapper.put(activity.getToolContentID(), newContent);
+		// store new toolContent mapped by original activity id
+		toolMapper.put(activity.getActivityID(), newContent);
 
 		// Invoke tool's importToolContent() method.
 		try {
@@ -2321,7 +2321,7 @@
 	switch (act.getActivityTypeId()) {
 	case Activity.TOOL_ACTIVITY_TYPE:
 	    // get back the toolContent in new system by toolContentID in old system.
-	    ToolContent content = toolMapper.get(actDto.getToolContentID());
+	    ToolContent content = toolMapper.get(actDto.getActivityID());
 	    // if activity can not find matching tool, the content should be null.
 	    if (content != null) {
 		((ToolActivity) act).setTool(content.getTool());