shuffle bugfix