diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index 7fb3ea41c..9bc04fd6f 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -509,13 +509,13 @@ void DivEngine::processRow(int i, bool afterDelay) {
         if (effectVal>0) speed2=effectVal;
         break;
       case 0x0b: // change order
-        if (changeOrd<0) {
+        if (changeOrd==-1) {
           changeOrd=effectVal;
           changePos=0;
         }
         break;
       case 0x0d: // next order
-        if (changeOrd<0) {
+        if (changeOrd<0 && curOrder<(song.ordersLen-1)) {
           changeOrd=-2;
           changePos=effectVal;
         }