randomization fix
randomization conflicts fix