Better behavior near end of song