fix shuffled etc.