Fix shuffle method