diff --git a/prism/src/simulator/TransitionList.java b/prism/src/simulator/TransitionList.java
index 3e727189..080b9b68 100644
--- a/prism/src/simulator/TransitionList.java
+++ b/prism/src/simulator/TransitionList.java
@@ -34,7 +34,9 @@ import prism.*;
 public class TransitionList
 {
 	private ArrayList<Choice> choices = new ArrayList<Choice>();
+	/** The index of the choice containing each transition. */
 	private ArrayList<Integer> transitionIndices = new ArrayList<Integer>();
+	/** The offset with the choice containing each transition. */
 	private ArrayList<Integer> transitionOffsets = new ArrayList<Integer>();
 	private int numChoices = 0;
 	private int numTransitions = 0;
@@ -140,7 +142,7 @@ public class TransitionList
 	 */
 	public int getTotalIndexOfTransition(int i, int offset)
 	{
-		return transitionOffsets.get(i);
+		return transitionIndices.indexOf(i) + offset;
 	}
 
 	// Random selection of a choice