Fix bug 2668 -- added randomization.
Changed tags