Yeah, so I just have stopped doing that, I will create a playlist then just select the songs I want to hear.