diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java
index 9f200da10a..d10046ebe4 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java
@@ -44,6 +44,7 @@
  *
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
+ * @author Taeik Lim
  * @since 2.2
  */
 public abstract class JobBuilderHelper<B extends JobBuilderHelper<B>> {
@@ -182,42 +183,35 @@ protected boolean isRestartable() {
 		return properties.restartable;
 	}
 
-	protected void enhance(Job target) {
-
-		if (target instanceof AbstractJob) {
-
-			AbstractJob job = (AbstractJob) target;
-			job.setJobRepository(properties.getJobRepository());
-
-			JobParametersIncrementer jobParametersIncrementer = properties.getJobParametersIncrementer();
-			if (jobParametersIncrementer != null) {
-				job.setJobParametersIncrementer(jobParametersIncrementer);
-			}
-			JobParametersValidator jobParametersValidator = properties.getJobParametersValidator();
-			if (jobParametersValidator != null) {
-				job.setJobParametersValidator(jobParametersValidator);
-			}
-			ObservationRegistry observationRegistry = properties.getObservationRegistry();
-			if (observationRegistry != null) {
-				job.setObservationRegistry(observationRegistry);
-			}
-			MeterRegistry meterRegistry = properties.getMeterRegistry();
-			if (meterRegistry != null) {
-				job.setMeterRegistry(meterRegistry);
-			}
-
-			Boolean restartable = properties.getRestartable();
-			if (restartable != null) {
-				job.setRestartable(restartable);
-			}
-
-			List<JobExecutionListener> listeners = properties.getJobExecutionListeners();
-			if (!listeners.isEmpty()) {
-				job.setJobExecutionListeners(listeners.toArray(new JobExecutionListener[0]));
-			}
+	protected void enhance(AbstractJob job) {
+		job.setJobRepository(properties.getJobRepository());
 
+		JobParametersIncrementer jobParametersIncrementer = properties.getJobParametersIncrementer();
+		if (jobParametersIncrementer != null) {
+			job.setJobParametersIncrementer(jobParametersIncrementer);
+		}
+		JobParametersValidator jobParametersValidator = properties.getJobParametersValidator();
+		if (jobParametersValidator != null) {
+			job.setJobParametersValidator(jobParametersValidator);
+		}
+		ObservationRegistry observationRegistry = properties.getObservationRegistry();
+		if (observationRegistry != null) {
+			job.setObservationRegistry(observationRegistry);
+		}
+		MeterRegistry meterRegistry = properties.getMeterRegistry();
+		if (meterRegistry != null) {
+			job.setMeterRegistry(meterRegistry);
 		}
 
+		Boolean restartable = properties.getRestartable();
+		if (restartable != null) {
+			job.setRestartable(restartable);
+		}
+
+		List<JobExecutionListener> listeners = properties.getJobExecutionListeners();
+		if (!listeners.isEmpty()) {
+			job.setJobExecutionListeners(listeners.toArray(new JobExecutionListener[0]));
+		}
 	}
 
 	public static class CommonJobProperties {