Shuffle does not return, fixed