diff --git a/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/model/tm/Step.java b/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/model/tm/Step.java
index 769202cd88eaf36db1107f15f651866cf851dec1..35b16ed69d2c8929de383ab3ae1b2474f5a92a1e 100644
--- a/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/model/tm/Step.java
+++ b/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/model/tm/Step.java
@@ -31,7 +31,7 @@ public class Step {
 	private int tmId;
 
 	@XmlElement
-	private int stepIndex;
+	private Integer stepIndex;
 
 	@ManyToOne(fetch = FetchType.EAGER)
 	private TestInstance testInstance;
@@ -129,11 +129,11 @@ public class Step {
 		this.receiverIds = receiverIds;
 	}
 
-	public int getStepIndex() {
+	public Integer getStepIndex() {
 		return stepIndex;
 	}
 
-	public void setStepIndex(int stepIndex) {
+	public void setStepIndex(Integer stepIndex) {
 		this.stepIndex = stepIndex;
 	}