Xpath bug fix