diff --git a/src/engine/engine.h b/src/engine/engine.h
index 6ee5d0aae..5d1108f79 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -38,7 +38,7 @@ struct DivChannelState {
   int vibratoDepth, vibratoRate, vibratoPos, vibratoDir, vibratoFine;
   int tremoloDepth, tremoloRate, tremoloPos;
   unsigned char arp, arpStage, arpTicks;
-  bool doNote, legato, portaStop, keyOn, nowYouCanStop, stopOnOff, arpYield, delayLocked, inPorta, scheduledSlideReset;
+  bool doNote, legato, portaStop, keyOn, keyOff, nowYouCanStop, stopOnOff, arpYield, delayLocked, inPorta, scheduledSlideReset;
 
   DivChannelState():
     note(-1),
@@ -70,6 +70,7 @@ struct DivChannelState {
     legato(false),
     portaStop(false),
     keyOn(false),
+    keyOff(false),
     nowYouCanStop(true),
     stopOnOff(false),
     arpYield(false),
diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index 2d46bcf60..58350fb6b 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -432,6 +432,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
   if (pat->data[whatRow][0]==100) {
     //chan[i].note=-1;
     chan[i].keyOn=false;
+    chan[i].keyOff=true;
     if (chan[i].stopOnOff) {
       chan[i].portaNote=-1;
       chan[i].portaSpeed=-1;
@@ -671,6 +672,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
       dispatchCmd(DivCommand(DIV_CMD_VOLUME,i,chan[i].volume>>8));
     }
     chan[i].keyOn=true;
+    chan[i].keyOff=false;
   }
   chan[i].nowYouCanStop=true;
 
@@ -849,8 +851,7 @@ bool DivEngine::nextTick(bool noAccum) {
         }
         
       }
-      // TODO: RE-ENABLE IF BROKE YET AGAIN!
-      if (/*chan[i].keyOn && */chan[i].portaSpeed>0) {
+      if ((chan[i].keyOn || chan[i].keyOff) && chan[i].portaSpeed>0) {
         if (dispatchCmd(DivCommand(DIV_CMD_NOTE_PORTA,i,chan[i].portaSpeed,chan[i].portaNote))==2 && chan[i].portaStop) {
           chan[i].portaSpeed=0;
           chan[i].oldNote=chan[i].note;
@@ -910,13 +911,6 @@ bool DivEngine::nextTick(bool noAccum) {
   return ret;
 }
 
-// TODO: all of this!
-// PLAYBACK LOGIC:
-// 1. end of buffer for all chips? if so quit
-// 2. are all chips clocked yet?
-//    if not clock them until possible and try again
-// 3. engine tick
-
 void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsigned int size) {
   if (out!=NULL) {
     memset(out[0],0,size*sizeof(float));