Attempt better handling of pairs