diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade b/veejay-current/veejay-client/share/gveejay.reloaded.glade
index fd82fae2..a85a8e37 100644
--- a/veejay-current/veejay-client/share/gveejay.reloaded.glade
+++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade
@@ -2525,7 +2525,9 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="loop_stop">
-    <property name="upper">10000</property>
+    <property name="upper">1000000</property>
+    <property name="lower">0</property>
+    <property name="value">0</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
diff --git a/veejay-current/veejay-server/libsample/sampleadm.c b/veejay-current/veejay-server/libsample/sampleadm.c
index 64063ef7..a317185d 100644
--- a/veejay-current/veejay-server/libsample/sampleadm.c
+++ b/veejay-current/veejay-server/libsample/sampleadm.c
@@ -1235,6 +1235,11 @@ int sample_set_resume(int s1,long position)
                 sample->resume_pos = start;
             }
         }
+
+        if(sample->offset > 0) {
+            sample->resume_pos = sample->offset;
+        }
+
         sample->loop_pp = 0;
     }
     else {
diff --git a/veejay-current/veejay-server/veejay/vj-perform.c b/veejay-current/veejay-server/veejay/vj-perform.c
index d04637e9..b7ebb1b3 100644
--- a/veejay-current/veejay-server/veejay/vj-perform.c
+++ b/veejay-current/veejay-server/veejay/vj-perform.c
@@ -3656,6 +3656,9 @@ static int vj_perform_transition_get_sample_position(int sample_id)
             position = 0;
     }
     sample_update_offset(sample_id, position);
+
+    veejay_msg(VEEJAY_MSG_DEBUG, "Sample %d is at position %d", sample_id, position);
+
     return (sample_b[0] + position); //1
 }