diff --git a/bin/ascoltami b/bin/ascoltami
--- a/bin/ascoltami
+++ b/bin/ascoltami
@@ -278,10 +278,10 @@ class GoButton:
         if state == 'stop':
             currentPath = self.player.song_uri
             try:
-                i = self.songURIs.index(currentPath) + 1
-            except ValueError:
-                i = 0
-            nextPath = self.songURIs[i]
+                nextPath = self.songURIs[self.songURIs.index(currentPath) + 1]
+            except (ValueError, IndexError):
+                nextPath = self.songURIs[0]
+                
             return ("next song %s" % shortSongPath(nextPath, self.songURIs),
                     lambda: self.player.play(nextPath))
 
diff --git a/show/dance2008/readme b/show/dance2008/readme
--- a/show/dance2008/readme
+++ b/show/dance2008/readme
@@ -113,7 +113,7 @@ next time:
 
   record-everything mode that makes curves out of whatever happens on stage
 
-  asco makes lots of errors after you play through the last song
+OK  asco makes lots of errors after you play through the last song
 
   five second post