Fix randomization!