diff --git a/src/main/java/sh/ball/audio/ShapeAudioPlayer.java b/src/main/java/sh/ball/audio/ShapeAudioPlayer.java
index 8453816..d6d8320 100644
--- a/src/main/java/sh/ball/audio/ShapeAudioPlayer.java
+++ b/src/main/java/sh/ball/audio/ShapeAudioPlayer.java
@@ -13,6 +13,7 @@ import sh.ball.shapes.Vector2;
 
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioInputStream;
+import javax.swing.*;
 
 public class ShapeAudioPlayer implements AudioPlayer<List<Shape>> {
 
@@ -74,6 +75,7 @@ public class ShapeAudioPlayer implements AudioPlayer<List<Shape>> {
     if (currentShape >= frame.size()) {
       currentShape = 0;
       frame = frameQueue.take();
+      lengthDrawn = 0;
       updateLengthIncrement();
     }
 
diff --git a/src/main/java/sh/ball/gui/Controller.java b/src/main/java/sh/ball/gui/Controller.java
index fad772c..ead0322 100644
--- a/src/main/java/sh/ball/gui/Controller.java
+++ b/src/main/java/sh/ball/gui/Controller.java
@@ -636,7 +636,7 @@ public class Controller implements Initializable, FrequencyListener, MidiListene
   @Override
   public void sendMidiMessage(int status, MidiNote note, int midiPressure) {
     double frequency = note.frequency();
-    if (frequency > 32 && frequency < 8000) {
+    if (frequency > 15 && frequency < 9000) {
       double oldVolume = scaleSlider.getValue();
       double volume = midiPressureToPressure(scaleSlider, midiPressure);
       volume /= 10;