Fix an additional UDA/Lustre shuffling bug