Correcting for true randomness
Merge commit 'dfddac299ee02c0b2c3e15a956b6a56ee12c1ee5'