MakeRandom fix