Redid fix for Xpath issue T3-883