diff --git a/src/player.rs b/src/player.rs
index 70f97797..2b7b83c1 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -253,6 +253,7 @@ impl PlayerInternal {
                     }
 
                     None => {
+                        end_of_track.complete(());
                         if self.state.is_playing() {
                             self.run_onstop();
                         }
diff --git a/src/session.rs b/src/session.rs
index 028f041d..86162bd9 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -221,6 +221,7 @@ impl Session {
             0x4a => (),
             0x1b => {
                 let country = String::from_utf8(data.as_ref().to_owned()).unwrap();
+                info!("Country: {:?}", country);
                 self.0.data.write().unwrap().country = country;
             }