[ISS-1] Fixed randomisation