Fixed the XPATHs