diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index 00b4a1d2..c5c49f4c 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -791,6 +791,8 @@ void DivEngine::processRow(int i, bool afterDelay) {
         // - note that a volume value does not stop tremolo - instead it glitches this whole thing up
         if (chan[i].tremoloDepth==0) {
           chan[i].tremoloPos=0;
+          dispatchCmd(DivCommand(DIV_CMD_VOLUME,i,chan[i].volume>>8));
+          dispatchCmd(DivCommand(DIV_CMD_HINT_VOLUME,i,chan[i].volume>>8));
         }
         chan[i].tremoloDepth=effectVal&15;
         chan[i].tremoloRate=effectVal>>4;
diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp
index 07d39582..58ee524e 100644
--- a/src/gui/sysConf.cpp
+++ b/src/gui/sysConf.cpp
@@ -863,7 +863,7 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo
         if (echoBufSize1<0) echoBufSize1=0;
         if (echoBufSize1>2725) echoBufSize1=2725;
         echoDelay=2725-echoBufSize1;
-        altered=true;;
+        altered=true;
       } rightClickable
       ImGui::Text("Echo feedback:");
       if (CWSliderInt("##EchoFeedback",&echoFeedback,0,255)) {