Fixed shuffling, thanks @owenversteeg