Fixed shuffle does not terminate bug!