=clu #3517 Guard against wrong random selection (backport)