Add local handling for shuffle

should resolve stack/52b43f077841550ad40d8928