Fix randomization