Fixed bug with song change