diff --git a/db/migrate/20130403003950_add_last_activity_column_into_project.rb b/db/migrate/20130403003950_add_last_activity_column_into_project.rb
index ddb0484..2a036bd 100644
--- a/db/migrate/20130403003950_add_last_activity_column_into_project.rb
+++ b/db/migrate/20130403003950_add_last_activity_column_into_project.rb
@@ -4,7 +4,13 @@ class AddLastActivityColumnIntoProject < ActiveRecord::Migration
     add_index :projects, :last_activity_at
 
     Project.find_each do |project|
-      project.update_attribute(:last_activity_at, project.last_activity_date)
+      last_activity_date = if project.last_activity
+                             project.last_activity.created_at
+                           else
+                             project.updated_at
+                           end
+
+      project.update_attribute(:last_activity_at, last_activity_date)
     end
   end
 
--
libgit2 0.21.2