Random Search Fix