Fixed randomization?

I’m fairly sure I’ve fixed the randomization bugs. I’ve done a bit of
testing, but not sure if I’ve done enough of it. Still, I’m fairly
certain I fixed it.