Fix behavior of next() when setting shuffle after calling previous()