Fixing stuff

fixed issue with shuffle.