Motorola Atrix 4G :: Music Player Doesn't Maintain Playlist

Ok, after fooling with my phone and checking out all the cool new things it can do after the GB update, I have finally found a flaw, at least on my phone. In the past when listening to music, either with the car dock or headphones or hooked to my speakers at work, whenever I paused the stock music player, it would always keep the playlist current and I could pick up where I left off. Even if I just shuffled all songs. Now when I shuffle all and come back to it later or the next day, it either doesn't show any music as queued or will show the song, but when I hit play, it just takes me to the music player home screen. I also have winamp installed and it does not have a problem keeping my songs in the list. I like to use the stock music player because I can pause or FF a song without having to unlock the phone. Nifty feature being able to see the song playing and having those options on the lock screen. Why is my music player losing the song list? On a side note, winamp remembers what I was playing even after a reboot, but it does not show up on the lock screen.