fix for the Shuffle function