diff --git a/src/main/java/com/eactive/eai/rms/common/scheduler/ClusteredSchedulerConfig.java b/src/main/java/com/eactive/eai/rms/common/scheduler/ClusteredSchedulerConfig.java
index 333dbd7..7d3ff53 100644
--- a/src/main/java/com/eactive/eai/rms/common/scheduler/ClusteredSchedulerConfig.java
+++ b/src/main/java/com/eactive/eai/rms/common/scheduler/ClusteredSchedulerConfig.java
@@ -19,23 +19,7 @@ public class ClusteredSchedulerConfig {
    
    @Autowired @Qualifier("MONITORING")
    private DataSourceType monitoringDatasource;
-   
-   /*
-   public class AutowiringSpringBeanJobFactory extends SpringBeanJobFactory {
-      @Override
-      protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
-         Object job = super.createJobInstance(bundle);
-         applicationContext.getAutowireCapableBeanFactory().autowireBean(job);
-         return job;
-      }
-   }
-   
-   @Bean
-   public SpringBeanJobFactory springBeanJobFactory() {
-      return new AutowiringSpringBeanJobFactory();
-   }
-   */
-   
+
    @Bean(name = "clusteredScheduler")
    public SchedulerFactoryBean clusteredScheduler() {
       
@@ -81,11 +65,15 @@ public class ClusteredSchedulerConfig {
       factory.setQuartzProperties(quartzProperties);
       factory.setAutoStartup(true);
       factory.setSchedulerName("EMS_ClusteredScheduler");
-//      factory.setJobFactory(springBeanJobFactory());
-      
+
+      AutoWiringSpringBeanJobFactory jobFactory =
+            new AutoWiringSpringBeanJobFactory(applicationContext.getAutowireCapableBeanFactory());
+      jobFactory.setApplicationContext(applicationContext);
+      factory.setJobFactory(jobFactory);
+
       factory.setApplicationContextSchedulerContextKey("applicationContext");
       factory.setApplicationContext(applicationContext);
-      
+
       return factory;
    }