WIP oops, fix non-shuffled case