Need to fix shuffle list selector