diff --git a/src/main/java/ch/psi/mxsc/BasePlate.java b/src/main/java/ch/psi/mxsc/BasePlate.java
index 34b62b6..6559bc5 100644
--- a/src/main/java/ch/psi/mxsc/BasePlate.java
+++ b/src/main/java/ch/psi/mxsc/BasePlate.java
@@ -198,7 +198,7 @@ public class BasePlate extends DeviceBase {
         try {
             Puck p = getPuckByName(name.substring(0, 2));
             if (p != null) {
-                return p.getSamples()[Integer.valueOf(name.substring(2, 3)) - 1];
+                return p.getSamples()[Integer.valueOf(name.substring(2, name.length())) - 1];
             }
         } catch (Exception ex) {
         }