more shuffle fix