Fixed shuffle again