Shuffle option doesn't work

This is a regression in 4.16.0 as it worked fine in 1.0.5.