Minor randomization change for special cases