Duplicate fix which doesn't break XPath