re-shuffle on reload
fix
fix