Randomness Fix