Peter,

I thought that would be the case, but I don't think it takes care of the issue. This is an example I just tried to make sure:

Currently playing 134/2804, shuffled.
Press shuffle once, currently playing 1432/2804, unshuffled.
Press shuffle again, currently playing 119/2804, shuffled.

So the position of the playing song changed from 134 to 119. There must be 15 songs I already heard that will come up again!

Note that if I again press the Shuffle button two times, the position will remain 119/2804. But this never happens the first time I shuffle-shuffle.

-Julio