Fix shuffle mode, fix #17