Fix shuffle not working because mixed with set