Possible fix for randomness