Randomize a bit better. Fixes #7