diff --git a/src/main/scala/org/xcit/nback/generators/SkewedSequenceGenerator.scala b/src/main/scala/org/xcit/nback/generators/SkewedSequenceGenerator.scala
index 91f7d26..fd99caa 100644
--- a/src/main/scala/org/xcit/nback/generators/SkewedSequenceGenerator.scala
+++ b/src/main/scala/org/xcit/nback/generators/SkewedSequenceGenerator.scala
@@ -52,11 +52,11 @@
       // 3. Based on the generated type, generate the item and append it to the buffer
       buffer += {nextTrialType() match {
         case TrialType.LURE_BEFORE_TARGET if buffer.length > N + 1 =>
-          buffer(buffer.length - 1 - N -1)
+          buffer(buffer.length - (N + 2))
         case TrialType.TARGET  if buffer.length > N =>
-          buffer(buffer.length - 1 - N)
+          buffer(buffer.length - (N - 1))
         case TrialType.LURE_BEFORE_TARGET if buffer.length > N =>
-          buffer(buffer.length - N)
+          buffer(buffer.length -  N)
         case _ =>
           alphabet.charAt(Random.nextInt(alphabet.length)).toString
       }}
@@ -75,10 +75,10 @@
     case rnd if rnd <= L1 =>
       L1 -= 1
       TrialType.LURE_BEFORE_TARGET
-    case rnd if rnd < rnd && rnd <= L1 + L2 =>
+    case rnd if rnd > L1 && rnd <= L1 + L2 =>
       L2 -= 1
       TrialType.LURE_AFTER_TARGET
-    case rnd if rnd <= L1 =>
+    case rnd if rnd > L1 + L2 && rnd <= L1 + L2 + T =>
       T -= 1
       TrialType.TARGET
     case _ =>