Party Mode Not So Random

So here' s the problem. On the weekends, we fire up XBMC Party Mode for all of our music (about 4,000 songs).
There are times that, when I'm actually listening to it, I hear 2-3 songs by the same artist, sometimes even the same album, all within 5 songs.

Is there a way to tweak party mode so it is a little more "all over the place"? I mean, I don't mind Michael Bublé every once in a while, but not three songs in a row....from his Christmas album....in May!
Thanks