Random generation hotfix