Bugfix with not shuffling.