fixed repeat and shuffle