Bugfix to shuffle -- mind my Is and Js!