Some fixes in Pairs to make it work correctly