India and Pakistan have agreed to resolve the issue of recent incidents of harassment of diplomats and non-diplomatic staff at their respective high commissions in New Delhi and Islamabad which had injected fresh tension in bilateral ties

A statement issued by foreign ministries of both India and Pakistan on Friday said the two countries " have mutually agreed to resolve matters related to the treatment of diplomats and diplomatic premises, in line with the 1992 "Code of Conduct for the treatment of diplomatic/consular personnel in India and Pakistan. "

The two South Asian rivals had for the last three weeks traded charges about harassment of each other's diplomats.

They said the decision to "retaliate" against Pakistan's diplomats was taken in New Delhi after Pakistan's security agencies "raided" the under-construction Indian High Commission residential complex in Islamabad on the intervening night of February 15 and 16. Water and power connection to the complex was also disrupted at the site.

 On the other hand, Pakistan had alleged there had been as many as 26 instances of harassment and intimidation of its diplomats since March 7.