Shuffle bug fix
WIP