Merge "Fix to use proper random values"