Randomness fix