more version random shuffle fixing