Fix issue with pairs