Fix crash with shuffeling
Add update for windows