Fix for array enumeration and randomness.