diff --git a/script.js b/script.js
index 7d45ba2..4bc4988 100644
--- a/script.js
+++ b/script.js
@@ -19,7 +19,7 @@ function Sample(arg) {
       <!--<div nexus-ui="number" id="${arg.ui}-reverbnumber" style="width:60px;margin:10px;"></div>-->
     </div>
 `;
-  
+
   //build the rack
   this.rack = new Nexus.Rack(arg.ui);
   //recollect components
@@ -28,7 +28,7 @@ function Sample(arg) {
   // this.volumenumber = this.rack[arg.ui + '-volumenumber'];
   this.reverb = this.rack[arg.ui + '-reverb'];
   // this.reverbnumber = this.rack[arg.ui + '-reverbnumber'];
-    
+
   //presets
   this.button.mode = "toggle";
   this.button.state = false;
@@ -42,7 +42,7 @@ function Sample(arg) {
   this.reverb.value = 0;
   this.reverb.interaction = "vertical"; // this doesn't work. TBD.. sth. is wrong!
   // this.reverbnumber.link(this.reverb);
-  
+
   //colors
   this.rack.colorize("accent","#00DCD8");
   this.rack.colorize("fill","#2B5EA3");
@@ -55,7 +55,7 @@ function Sample(arg) {
     this.loop = false;
     this.autostart = false;
   }
-  
+
   // volume(gain) -> [Main output]
   this.vol = new Tone.Volume().toDestination();
   this.vol.mute = true;
@@ -79,13 +79,14 @@ function Sample(arg) {
   );
 
   // source -> reverb(fx)
-  if (arg.autostart) this.button.turnOn();
+  if (this.autostart) this.button.turnOn();
   this.player = new Tone.Player({
     url: arg.url,
-    loop: arg.loop,
-    autostart: arg.autostart,
+    loop: this.loop,
+    autostart: this.autostart,
     fadeIn: 5,
     fadeOut: 5,
+    onstop: () => this.button.turnOff()
   }).connect(this.rev);
   this.button.on(
     "change",
@@ -94,9 +95,6 @@ function Sample(arg) {
       else this.player.stop();
     }.bind(this)
   );
-  if (arg.type == "oneshot") {
-    this.player.onstop = () => this.button.turnOff()
-  }
 }
 
 //script