Reshuffle tuples so they work as expected