diff --git a/Service.JobRunner/JobRunner.vb b/Service.JobRunner/JobRunner.vb
index a6f920e6..b35d8917 100644
--- a/Service.JobRunner/JobRunner.vb
+++ b/Service.JobRunner/JobRunner.vb
@@ -64,7 +64,7 @@ Public Class JobRunner
             {"Args", oJobConfig.Arguments}
         }
 
-        Dim oJobDetail = JobBuilder.Create(Of T)().
+        Dim oJob = JobBuilder.Create(Of T)().
             WithIdentity(oJobIdentity).
             UsingJobData(oJobData).
             Build()
@@ -76,7 +76,7 @@ Public Class JobRunner
             Build()
 
         If oJobConfig.Enabled Then
-            Await _scheduler.ScheduleJob(oJobDetail, oTrigger)
+            Await _scheduler.ScheduleJob(oJob, oTrigger)
 
             _Logger.Info("Job {0} scheduled.", JobName)
         Else
@@ -85,13 +85,18 @@ Public Class JobRunner
 
         ' If StartImmediately is True, start Job after 10 Seconds
         If oJobConfig.StartImmediately Then
+            Dim oDebugJob = JobBuilder.Create(Of T)().
+                WithIdentity(oJobIdentity & "-DEBUG").
+                UsingJobData(oJobData).
+                Build()
+
             Dim oDebugTrigger = TriggerBuilder.Create().
                 WithIdentity(oTriggerIdentity & "-DEBUG").
                 StartAt(DateBuilder.FutureDate(10, IntervalUnit.Second)).
                 Build()
 
             _Logger.Info("Job {0} will start in 10 Seconds.", JobName)
-            Await _scheduler.ScheduleJob(oJobDetail, oDebugTrigger)
+            Await _scheduler.ScheduleJob(oDebugJob, oDebugTrigger)
         End If
     End Function