Fix shuffle to save root