diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 3f5e42bb..82413010 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -809,4 +809,8 @@ exec sp_xml_removedocument @idoc
 
 COMMIT TRAN
 RETURN
+GO
+
+UPDATE ScheduleTasks SET TaskType = RTRIM(TaskType) + '.Code'
+WHERE SUBSTRING(RTRIM(TaskType), LEN(RTRIM(TaskType)) - 3, 4) <> 'Code'
 GO
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs
index 9b4f3604..5bdfa7c7 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Tasks/TaskManager.cs
@@ -224,11 +224,11 @@ namespace WebsitePanel.EnterpriseServer
             }
 
             // update last finish time
-            ScheduleInfo scheduleInfo = SchedulerController.GetSchedule(TopTask.ItemId);
-            if (scheduleInfo != null)
+            SchedulerJob schedule = SchedulerController.GetScheduleComplete(TopTask.ItemId);
+            if (schedule != null)
             {
-                scheduleInfo.LastFinish = DateTime.Now;
-                SchedulerController.UpdateSchedule(scheduleInfo);
+                schedule.ScheduleInfo.LastFinish = DateTime.Now;
+                SchedulerController.UpdateSchedule(schedule.ScheduleInfo);
             }
 
             // remove task from the stack