diff --git a/db/migrate/20150811083234_update_course_activity_time.rb b/db/migrate/20150811083234_update_course_activity_time.rb
deleted file mode 100644
index 9ba8140d8..000000000
--- a/db/migrate/20150811083234_update_course_activity_time.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class UpdateCourseActivityTime < ActiveRecord::Migration
-  def up
-    count = CourseActivity.all.count / 10 + 1
-    transaction do
-      for i in 1 ... count do i
-        CourseActivity.page(i).per(10).each do |activity|
-          if activity.course_act
-            if activity.course_act.respond_to?("created_at")
-              activity.created_at = activity.course_act.created_at
-            elsif activity.course_act.respond_to?("created_on")
-              activity.created_at = activity.course_act.created_on
-            end
-            activity.save
-          end
-        end
-      end
-    end
-  end
-
-  def down
-  end
-end
diff --git a/db/migrate/20150814024425_change_attachment_time.rb b/db/migrate/20150814024425_change_attachment_time.rb
new file mode 100644
index 000000000..fd1ffb7a7
--- /dev/null
+++ b/db/migrate/20150814024425_change_attachment_time.rb
@@ -0,0 +1,13 @@
+class ChangeAttachmentTime < ActiveRecord::Migration
+  def up
+    Attachment.where("container_type = 'Course'").each do |attachment|
+      if attachment.container && attachment.container.created_at.to_i > attachment.created_on.to_i
+        attachment.created_on = attachment.container.created_at + 3600 * 24
+        attachment.save
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20150814031258_update_course_activity_time.rb b/db/migrate/20150814031258_update_course_activity_time.rb
new file mode 100644
index 000000000..155e212a3
--- /dev/null
+++ b/db/migrate/20150814031258_update_course_activity_time.rb
@@ -0,0 +1,22 @@
+class UpdateCourseActivityTime < ActiveRecord::Migration
+  def up
+    count = CourseActivity.all.count / 10 + 1
+    transaction do
+      for i in 1 ... count do i
+      CourseActivity.page(i).per(10).each do |activity|
+        if activity.course_act
+          if activity.course_act.respond_to?("created_at")
+            activity.created_at = activity.course_act.created_at
+          elsif activity.course_act.respond_to?("created_on")
+            activity.created_at = activity.course_act.created_on
+          end
+          activity.save
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1488ca365..2014bf1ef 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150811083234) do
+ActiveRecord::Schema.define(:version => 20150814031258) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",                                  :null => false